Allow enabling amqp for carbon
Merge branch 'fix/amqp_never_enabled' into local