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