Changes for RabbitMQ 3.1.5