Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.12.4

Change-Id: Ic84adbc9fd35c554763e8f8a69418722fb11fb30