cleanup
Merge pull request #4768 from danmcp/master

Merged by openshift-bot