Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Improve readability of shouldFirePendingOnlyToStoredUri test
  Fix flakiness in ReplicationIT for pending events firing
  Only fire the specified pending event URI

Change-Id: Ie83763e4a9fe13522f356b569fc2360fa5883224
tree: e623d8673f8865116e9845590b6a15717e5f81b2
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/