NO-JIRA: correct issues found while rebasing bump(api,client-go)#30659

sanchezl wants to merge 2 commits intoopenshift:mainopenshift/origin:mainfrom

sanchezl:cluster-image-policy-renamesanchezl/origin:cluster-image-policy-renameCopy head branch name to clipboard