Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: ReplicationIT: Replace ExpectedException with assertThrows ReplicationFileBasedConfig#EventQueueNotEmptyException: Add missing serialVersionUID Change-Id: Ibaa65c80ec8494637d0844bb1a967ac35d93cd61