Fix upgrade functionality and associated tests
Merge pull request #3016 from pmorie/dev/fix_tests

Merged by openshift-bot