Fix platform upgrade tests
Merge pull request #3538 from pmorie/dev/fix_tests

Merged by openshift-bot