Automated cherry pick of #18220 on release-3.7#18221

Merged

openshift-merge-robot merged 1 commit intoopenshift:release-3.7from

enj:automated-cherry-pick-of-#18220-upstream-release-3.7

Jan 24, 2018

Commits on Jan 23, 2018

Fix issues with oc adm migrate authorization
enj
committed