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

DanStough merged 5 commits intorelease/1.16.xhashicorp/consul:release/1.16.xfrom

backport/dans/NET-3917/improve-integration-coverage/wrongly-smiling-kingfishhashicorp/consul:backport/dans/NET-3917/improve-integration-coverage/wrongly-smiling-kingfishCopy head branch name to clipboard