Pull down some upstreamed Icehouse fixes for multi-master MySQL setups.
Merge pull request #353 from bloomberg/icehouse-sql-master

Pull down some upstreamed Icehouse fixes for multi-master MySQL setups.