Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade testcontainers to 1.11.1

Change-Id: Ic01420377624f1001741f058440ff8eb4700c45b