Backport of Fix issue where terminating gateway service resolvers weren't properly cleaned up into release/1.15.x#16521

hc-github-team-consul-core merged 5 commits intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

backport/terminating-gateway-resolvers/nominally-helping-rayhashicorp/consul:backport/terminating-gateway-resolvers/nominally-helping-rayCopy head branch name to clipboard