Fix for bug 906266, bug 906230, and bug 906233
Merge pull request #1260 from abhgupta/abhgupta-dev

Merged by openshift-bot