Merge fixes for RabbitMQ clustering