Cleanup
Merge pull request #5223 from danmcp/master

Merged by openshift-bot