Merge branch 'stable-3.2' into stable-3.3

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

Change-Id: Iab364714135d693e011e8abbf7782ae620d009c4
tree: 239ab1dee65438d47ee86d97fe8f7d49f02cc533
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE