Fixes for upgrade script execution
Merge pull request #5 from pmorie/dev/upgrade_analysis

Fixes for upgrade script execution