Backport of [OSS] Improve Gateway Test Coverage of Catalog Health into release/1.15.x#18013

DanStough merged 6 commits intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizardhashicorp/consul:backport/dans/NET-3917/improve-integration-coverage/rapidly-able-lizardCopy head branch name to clipboard