Backport of fix some testing.T retry.R mixups into release/1.13.x#17601

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

backport/fix-retry-lint-errors/accurately-regular-owlhashicorp/consul:backport/fix-retry-lint-errors/accurately-regular-owlCopy head branch name to clipboard