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