Backport of Add node id/name to config into release/1.16.x#17796

chapmanc merged 1 commit intorelease/1.16.xhashicorp/consul:release/1.16.xfrom

backport/chappie/CC-5423/wholly-relative-birdhashicorp/consul:backport/chappie/CC-5423/wholly-relative-birdCopy head branch name to clipboard