Backport of ci: changes resulting from running on consul-enterprise into release/1.15.x#16822

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

backport/jm/go-tests-ent/urgently-inviting-muskoxhashicorp/consul:backport/jm/go-tests-ent/urgently-inviting-muskoxCopy head branch name to clipboard