Fix for bug 1035120
Merge pull request #4267 from abhgupta/abhgupta-dev

Merged by openshift-bot