Formatting fixes
Merge pull request #5166 from danmcp/master

Merged by openshift-bot