Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Fix replication to retry on lock errors Change-Id: Iab364714135d693e011e8abbf7782ae620d009c4