Fix for bug 1021467, 1020440, 1021041
Merge pull request #3956 from abhgupta/stage_34_2_fixes

Merged by openshift-bot