Fix for bug 1022444
Merge pull request #4005 from abhgupta/abhgupta-dev

Merged by openshift-bot