Backport of CVE Fix into release/1.21.0-rc2#22271

nitin-sachdev-29 merged 2 commits intorelease/1.21.0-rc2hashicorp/consul:release/1.21.0-rc2from

backport/nitin/cve-fix/evidently-organic-ostrichhashicorp/consul:backport/nitin/cve-fix/evidently-organic-ostrichCopy head branch name to clipboard