Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix naming for delay for draining the replication event queue

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