etcd peer discovery fixes (backport #11439)#11445

michaelklishin merged 2 commits intov3.13.xrabbitmq/rabbitmq-server:v3.13.xfrom

mergify/bp/v3.13.x/pr-11439rabbitmq/rabbitmq-server:mergify/bp/v3.13.x/pr-11439Copy head branch name to clipboard