Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  ElasticV6QueryChangesTest: Close indices after test

Change-Id: Id895f6b4a8bc5096d9c97232764b3295b758a79a
tree: c883ab493a9c443e1b3f7f16c3edf066b6e40070
  1. java/
  2. javatests/