Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix replication to retry on lock errors

Change-Id: Icacd9095feaefd240803405c5b0a16cc0b3a9ed8
tree: 3799b38cc3630d0b9d2201a276ec84b2f683d228
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE