Template cleanup
Merge pull request #4845 from danmcp/master

Merged by openshift-bot