This bug is to establish the current-version OCP downstream as an OCPBUGS anchor issue for backporting.

------------------------------------------------------------------

Jira Description

We need to downstream this PR to OCP 4.12 and backport it to OCP 4.11 so that users of OCP 4.11 and 4.12 don't experience catalog pods preventing their cluster from scaling down.

Acceptance Criteria

• The changes in the PR are available for OCP 4.11 and 4.12

Definition of Ready

• PRs merged into downstream OCP repos branches 4.11/4.12

Definition of Done

• The downstream images are verified as having the changes applied and the cluster can be scaled down successfully.