Fix for bug 1007582 and bug 1008517
Merge pull request #3650 from abhgupta/stage_fix_1007582_1008517

Merged by openshift-bot