fix bz 967779, 967409, 967395
Merge pull request #2654 from rajatchopra/master

Merged by openshift-bot