Automated cherry pick of #18005 on release-3.8#18220

Merged

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

enj:automated-cherry-pick-of-#18005-upstream-release-3.8

Jan 24, 2018

Commits on Jan 22, 2018

Fix issues with oc adm migrate authorization
enj
committed