Merge branch 'stable-3.2'

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

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