[release-3.7] Migrate: handle NotFound via resource matching and during conflicts#18287

Merged

openshift-merge-robot merged 1 commit intoopenshift:release-3.7from openshift-cherrypick-robot:cherry-pick-18280-to-release-3.7

Jan 26, 2018

+78-4

Commits on Jan 25, 2018

Migrate: handle NotFound via resource matching and during conflicts

enj
authored and
openshift-cherrypick-robot
committed