Pull down some upstreamed Icehouse fixes for multi-master MySQL setups.
Revert earlier RabbitMQ change to go back to having all disc nodes in cluster.
Merge pull request #353 from bloomberg/icehouse-sql-master

Pull down some upstreamed Icehouse fixes for multi-master MySQL setups.
Merge pull request #355 from bloomberg/rabbitmq-disk

Revert earlier RabbitMQ change to go back to having all disc nodes in cluster