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
tree: 964d6ab1ec5d274bf54f9e6a22ee93318a9324b0
  1. .settings/
  2. src/
  3. .gitignore
  4. .mailmap
  5. BUILD
  6. LICENSE