Update notes for submitted changes

* Refactor AMQP message broker selection