Merge pull request #4538 from danmcp/master

Merged by openshift-bot
Bug 998337