The latest Spring AMQP release has deprecated setQueue in favour of setDefaultReceiveQueue. We should probably adapt our configuration structure to match that change and deprecate spring.rabbitmq.template.queue in favour of spring.rabbitmq.template.default-receive-queue.
Given this change was introduced early in 2.1.x I am tempted to make it for 2.1.1 still.
Let's see what the rest of the team thinks.