amqp: add support for more connection options
Small whitespace adjustment + accept :broker for amqp host