fix for bz967706
Merge pull request #2670 from rajatchopra/master

Merged by openshift-bot