Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Align dependencies based on testcontainers 1.11.0
  Upgrade testcontainers to 1.11.0

Change-Id: Ic4d6c8aea527a1d4a5bbef31b1203817148414b8