Fix for bug 1039151
Merge pull request #4294 from abhgupta/bug_1021041

Merged by openshift-bot