Changes for RabbitMQ 3.2.1