Fixes to cleanup during app operation failures
Merge pull request #2564 from abhgupta/abhgupta-dev

Merged by openshift-bot