Backport finalizer fixes to release-v1.40#4590

caseydavenport merged 2 commits intotigera:release-v1.40tigera/operator:release-v1.40from

caseydavenport:casey-backport-finalizer-v1.40caseydavenport/operator:casey-backport-finalizer-v1.40Copy head branch name to clipboard