OCPBUGS-65951: [release-4.20]: Fix linter issues, add missing cheryy-pick bits of #2844#2866

openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.20openshift/ovn-kubernetes:release-4.20from

ormergi:fix-cp-conflict-pr2844ormergi/ocp-ovn-kubernetes:fix-cp-conflict-pr2844Copy head branch name to clipboard