v3.2.6
Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Fix replication to retry on lock errors Change-Id: Icacd9095feaefd240803405c5b0a16cc0b3a9ed8