Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  e2e-tests: Add JAVA_OPTS support to the framework
  ElasticV{6,7}QueryChangesTest: Add comment about issue 10120

Change-Id: Ic6e1de59325c26568ca23bcf04d4bd0b4b1b27a5
tree: 79566e84df4eb5bb558c90cf45b5701cd266523c
  1. java/
  2. javatests/