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

Merged by openshift-bot
bz#1157863 - rubygem-openshift-origin-routing-daemon needs to set the file mode
Merge pull request #5911 from calfonso/bz1157863

Merged by openshift-bot