Upgrade fix for warning handling
Merge pull request #3513 from ironcladlou/stg/upgrader-fixes

Merged by openshift-bot