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

Merged by openshift-bot