Backport of fix some testing.T retry.R mixups into release/1.15.x#17603

rboyer merged 1 commit intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

backport/fix-retry-lint-errors/deadly-honest-camelhashicorp/consul:backport/fix-retry-lint-errors/deadly-honest-camelCopy head branch name to clipboard