Changes for RabbitMQ 3.3.0