Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I1b3977e395bba314c7c87e7b26835659f4c222f3
tree: 36826c8d5fdb11ead49e60a906999804106d74b2
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/