Fix for bug 1022948
Merge pull request #4012 from abhgupta/abhgupta-dev

Merged by openshift-bot