Backport of backport ent changes to oss into release/1.16.x#17617

hc-github-team-consul-core merged 2 commits intorelease/1.16.xhashicorp/consul:release/1.16.xfrom

backport/fix-missing-ent-changes/incredibly-driven-sawfishhashicorp/consul:backport/fix-missing-ent-changes/incredibly-driven-sawfishCopy head branch name to clipboard