Polishing - PR comments

Also bump rabbit-client to 3.0.4

Opened AMQP-301 to remove Spring 3.1 deprecations.
AMQP-301 Remove Spring 3.1 Deprecations

XmlBeanFactory is deprecated; replace with a
DefaultListableBeanFactory loaded by an XmlBeanDefinitionReader.