Backport of Fix catalog service endpoint when querying for a peer service into release/1.20.x#22261

hc-github-team-consul-core wants to merge 4 commits intorelease/1.20.xhashicorp/consul:release/1.20.xfrom

backport/f-catalog-service-peer/ultimately-optimal-opossumhashicorp/consul:backport/f-catalog-service-peer/ultimately-optimal-opossumCopy head branch name to clipboard