Various bits of cleanup detected when using Go Workspaces#17462

mkeeler merged 1 commit intomainhashicorp/consul:mainfrom

workspaceshashicorp/consul:workspacesCopy head branch name to clipboard