Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Deps: Update testcontainers to version 1.10.7

Change-Id: Ic03d7482261113e0e17ac5d128e2064bee1eea9b