Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Improve readability of shouldFirePendingOnlyToStoredUri test
  Fix flakiness in ReplicationIT for pending events firing

Change-Id: Id40baca92acc9fba8656630f725d55e5fbb6662b
tree: 7754d0d2faad913af14596625eac0bc9fcc61e93
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/