Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.15.0

Change-Id: Ic79bbbf04fb90f1655ad0917265f49b1372befd5
tree: 9cd818a25fb0b5041fa5755e5d2533946538adae
  1. java/
  2. javatests/