Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.14.2

Change-Id: I07386b3b619f26483f28d8cf321a67cc6964c8b4