Initial clean-up
Merge pull request #4346 from nhr/origin_3_doc_updates

Merged by openshift-bot