Backport of troubleshoot: fixes and updated messages into release/1.15.x#16303

malizz merged 2 commits intorelease/1.15.xhashicorp/consul:release/1.15.xfrom

backport/troubleshoot-fixes/remarkably-together-humpbackhashicorp/consul:backport/troubleshoot-fixes/remarkably-together-humpbackCopy head branch name to clipboard