Comment 13 for bug 1592200

I've pushed the WIP to:

  cs:~james-page/rabbitmq-server-bug1592200

it would be great if the landscape team could use that charm for a few test runs - I'd like to get confidence that the change is good before we backport to stable as well.