fix for bz970008
Merge pull request #2738 from rajatchopra/master

Merged by openshift-bot