Updates to enable zone aware amqp spout.