Fix for bug 985496
Merge pull request #3278 from abhgupta/stage_985496

Merged by openshift-bot