Backport of [API Gateway] fix dangling service registrations into release/1.2.x#2323

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

backport/net-4408/fix-dangling-service-registrations/officially-fit-fireflyhashicorp/consul-k8s:backport/net-4408/fix-dangling-service-registrations/officially-fit-fireflyCopy head branch name to clipboard