Various cleanup
Merge pull request #2643 from danmcp/master

Merged by openshift-bot