AMQP-303 - Improve Rules Compliance (Sonar)

See also: https://jira.springsource.org/browse/AMQP-303