Backport of Merge pull request #5288 from hashicorp/NET-3648_fix into release/1.15.x#17165

NiniOak merged 2 commits intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

backport/cp_NET-3648_part2/genuinely-civil-toucanhashicorp/consul:backport/cp_NET-3648_part2/genuinely-civil-toucanCopy head branch name to clipboard