Refactored upgrade routine to bring logic out of db requests but into Python code.

Refactored upgrade routine to bring logic out of db requests but into Python code. #2299