Various cleanup
Merge pull request #3305 from danmcp/master

Merged by openshift-bot