Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I6e262d2c22d2dcd49b341b3c752d6d8b6c93b32c
tree: 4becf2f6e34d3a8c607837e61fefec5d1bb1812f
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE