Fix RabbitMQ cluster support

These changes allow RabbitMQ to cluster correctly, and should have minimal impact.