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

Merged by openshift-bot