Bug 1919453: Update to latest 4.7 state where possible#25821

smarterclayton wants to merge 4 commits intoopenshift:release-4.6openshift/origin:release-4.6from

smarterclayton:reset_to_latestsmarterclayton/origin:reset_to_latestCopy head branch name to clipboard