Backport of fix: golangci-lint staticcheck errors into release/1.21.x#22641

sreeram77 merged 2 commits intorelease/1.21.xhashicorp/consul:release/1.21.xfrom

backport/sreeram77/staticcheck-fix/namely-together-parakeethashicorp/consul:backport/sreeram77/staticcheck-fix/namely-together-parakeetCopy head branch name to clipboard