Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade testcontainers to 1.12.3

Change-Id: I1c3e6e0d0b8863b6965d9369ad3d9b78083dc3e3