Backport of OSS -> CE into release/1.16.x#18546

hc-github-team-consul-core wants to merge 1 commit intorelease/1.16.xhashicorp/consul:release/1.16.xfrom

backport/spatel/oss_to_ce/highly-moral-spiderhashicorp/consul:backport/spatel/oss_to_ce/highly-moral-spiderCopy head branch name to clipboard