[BACKPORT] 1.15.x manual backport of OSS->CE branch#18552

analogue merged 1 commit intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

spatel/backport-1.15.x-oss-to-cehashicorp/consul:spatel/backport-1.15.x-oss-to-ceCopy head branch name to clipboard