Fix for bug 1019880
Fix for bug 1019876
Merge pull request #3915 from abhgupta/abhgupta-dev

Merged by openshift-bot