Fix 4-6 CP merge conflict#26512

Merged

bobfuru merged 1 commit intoopenshift:enterprise-4.6from

bobfuru:BZ1850510-update-4-6-CP

Oct 19, 2020

Commits on Oct 15, 2020

Fix 4-6 CP merge conflict
Bob Furu
committed