Two things here:
1. This is another HA-only module (for now)
2. Unless there is another chunk I missed elsewhere in this patch, this one needs all the qpid* -> amqp* magic you have elsewhere