Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.12.5

Change-Id: Ie017988456930e9aa72d06639c7ae2836ef9cb65