fix https://bugzilla.redhat.com/show_bug.cgi?id=1062531
Merge pull request #4690 from rajatchopra/master

Merged by openshift-bot