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

These upstreamed patches appear to fix some of the multi-master deadlocks seen with nova-conductor and OpenStack bits.