Fixes based on review by Ravi
Merge pull request #2538 from abhgupta/abhgupta-dev

Merged by openshift-bot