Changes for RabbitMQ 3.4.2