Refactorings to aid switching between native rabbit libs and Spring AMQP RabbitTemplate
Clean ups