RabbitMQ changes for BZ1129424.