Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.13.0

Change-Id: Iee893a1ba9f18c9fd3f755d9a573a7ec69b6d42c