Don't break rabbitmqctl remove_cluster_node --offline.
Merge bug26337 (again)