Initial changes to support single host RabbitMQ install