Fix amqp msg content type and default external addr

Trying to cherry pick some of Jonas' and James' permanent fixes from their branches. I'll avoid the temporary workarounds for now.