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