[release-3.8] Migrate: handle NotFound via resource matching and during conflicts#18286

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

openshift-cherrypick-robot:cherry-pick-18280-to-release-3.8openshift-cherrypick-robot/origin:cherry-pick-18280-to-release-3.8Copy head branch name to clipboard