Backport of OSS -> CE into release/1.15.x#18547

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

backport/spatel/oss_to_ce/mentally-well-moccasinhashicorp/consul:backport/spatel/oss_to_ce/mentally-well-moccasinCopy head branch name to clipboard