fix bz1006645
Merge pull request #3615 from rajatchopra/master

Merged by openshift-bot