Fix for bug 997008
Merge pull request #3462 from abhgupta/stage_fix_997008

Merged by openshift-bot