Merge pull request #4 from pmorie/dev/upgrade_analysis

Dev/upgrade analysis
Fixes for upgrade script execution