Fix merge conflict with PR#26070 and PR#26521 typo in 4-7#29116

Merged

bobfuru merged 1 commit intoopenshift:enterprise-4.7from

bobfuru:fix-conflict-26070-26521-4-7

Feb 3, 2021

Commits on Feb 3, 2021

Fix merge conflict with PR#26070 and PR#26521 typo in 4-7
Bob
committed