AMQP-430 Fix Package Tangle

JIRA: https://jira.spring.io/browse/AMQP-430

Annotation support introduced a tangle between config and annotation.