Bug 1044225
cleanup
Merge pull request #4497 from danmcp/master

Merged by openshift-bot