Backport of k8s compat - Openshift versions into release/1.16.x#18442

david-yu merged 2 commits intorelease/1.16.xhashicorp/consul:release/1.16.xfrom

backport/dyu/openshift/implicitly-moral-grizzlyhashicorp/consul:backport/dyu/openshift/implicitly-moral-grizzlyCopy head branch name to clipboard