Bug 991225: upgrade script should be run before setup during incompatible upgrade
Merge pull request #3275 from pmorie/stg/991225

Merged by openshift-bot