v3.1.11
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Fix replication to retry on lock errors Change-Id: Ib4b2c1fcac5da6551f72bce68a101b93e9b43b19