[release-2.15] Manual cherry-pick#1558

openshift-merge-bot[bot] merged 2 commits intostolostron:release-2.15stolostron/config-policy-controller:release-2.15from

dhaiducek:manual-sync-1553-1557dhaiducek/config-policy-controller:manual-sync-1553-1557Copy head branch name to clipboard