Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I58ce5a03d7b1094ef859c4cd2bd08a3ead00ba30
tree: 8fca3f5da9bfc8a82c14dd8e9bfd4e2f02dd65e5
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE