Backport of Clean up resources in test into release/1.16.x#18801

hc-github-team-consul-core wants to merge 1 commit intorelease/1.16.xhashicorp/consul:release/1.16.xfrom

backport/kisunji/cleanup-resources/solely-moved-dodohashicorp/consul:backport/kisunji/cleanup-resources/solely-moved-dodoCopy head branch name to clipboard