Manual backport of #12373#12378

michaelklishin merged 2 commits intov4.0.xrabbitmq/rabbitmq-server:v4.0.xfrom

mk-backport-12373rabbitmq/rabbitmq-server:mk-backport-12373Copy head branch name to clipboard