Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade testcontainers to 1.13.0
  ElasticContainer: Upgrade V7_6 to elasticsearch 7.6.1
  Update jetty to 9.4.24.v20191120

Change-Id: I3026e9fc709d03b232424ca8dd203c2528000f08
tree: 6d6de17461850b489f8d6dfc5bc074f7738473ef
  1. java/
  2. javatests/