Fix for bug 1010632
Merge pull request #3682 from abhgupta/abhgupta-dev

Merged by openshift-bot