correctly handle broken AMQP messages
Merge branch 'develop' into otter