Fix for bug 906266 and bug 904913
Merge pull request #1279 from abhgupta/abhgupta-dev

Merged by openshift-bot