fix bz 1156361. Race condition between destroy-app and configure.
Merge pull request #5909 from rajatchopra/stg

Merged by openshift-bot