Backport reconciler flake fix#16871

openshift-merge-robot merged 2 commits intoopenshift:masteropenshift/origin:masterfrom

gnufied:backport-reconciler-flake-fixgnufied/origin:backport-reconciler-flake-fixCopy head branch name to clipboard