Backport of [API Gateway] Conformance Test Fixes into release/1.2.x#2329

hc-github-team-consul-core merged 4 commits intorelease/1.2.xhashicorp/consul-k8s:release/1.2.xfrom

backport/net-4411/conformance-test-fixes/supposedly-topical-tahrhashicorp/consul-k8s:backport/net-4411/conformance-test-fixes/supposedly-topical-tahrCopy head branch name to clipboard