More language cleanup & consolidation
Merge pull request #3282 from nhr/updates

Merged by openshift-bot