[DownstreamMerge] Bug 2060549: Downstream merge 3-8-22#989

Merged

openshift-merge-robot merged 3 commits intoopenshift:masterfrom

trozet:downstream_merge_3-8-22

Mar 10, 2022

Commits on Mar 7, 2022

Commits on Mar 8, 2022

Merge remote-tracking branch 'origin/master' into downstream_merge_3-8-22
trozet
committed