Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: If0462b358be65730f4d6531b1260f2ad3d9d972e
tree: 5993e4a576171fc37939e2d85c05fed43018d902
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/