Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade testcontainers to 1.11.4

Change-Id: Id270c998691dc2d6eb5d2482cf7acc7ee06a1b7a