Fix for the underlying issue behind bug 924651
Merge pull request #1779 from abhgupta/abhgupta-dev

Merged by openshift-bot