Merge pull request #1360 from abhgupta/abhgupta-dev

Merged by openshift-bot
read from primary - bz910610
Merge pull request #1362 from rajatchopra/master

Merged by openshift-bot