don't let amqp consumers barf if raven is not setup
Merge remote-tracking branch 'origin/bootstrap' into bootstrap