Backport of Fix a bug that wrongly trims domains when there is an overlap with DC name into release/1.16.x #4774

Job	Run time
Setup	7s
Generate Envoy Job Matrices	7s
dev-build / build	1m 26s
vault-integration-test (1.13.1)	2m 41s
vault-integration-test (1.12.5)	2m 41s
vault-integration-test (1.11.9)	2m 39s
vault-integration-test (1.10.11)	2m 27s
envoy-integration-test (1.26.4, server, case-property-override\|case-terminating-gateway-hostnames...	6m 14s
envoy-integration-test (1.26.4, server, case-gateway-without-services\|case-http\|case-cross-peer-c...	4m 45s
envoy-integration-test (1.26.4, server, test-sds-server\|case-wasm\|case-dogstatsd-udp\|case-central...	5m 8s
envoy-integration-test (1.26.4, server, case-cfg-resolver-dc-failover-gateways-none)	1m 44s
envoy-integration-test (1.26.4, client, case-property-override\|case-terminating-gateway-hostnames...	6m 41s
envoy-integration-test (1.26.4, client, case-gateway-without-services\|case-http\|case-cross-peer-c...	6m 42s
envoy-integration-test (1.26.4, client, test-sds-server\|case-wasm\|case-dogstatsd-udp\|case-central...	5m 52s
envoy-integration-test (1.26.4, client, case-cfg-resolver-dc-failover-gateways-none)	2m 22s
nomad-integration-test (v1.3.3)	2m 4s
nomad-integration-test (v1.2.10)	1m 59s
nomad-integration-test (v1.1.16)	2m 23s
compatibility-integration-test	9m 15s
test-integrations-success	1s
	1h 7m 18s

Provide feedback