Fix for bug 1022370, 1023207
Merge pull request #4001 from abhgupta/abhgupta-dev

Merged by openshift-bot