Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade testcontainers to 1.11.3

Change-Id: Ie4277498d5f39d1ab56df9987ba23e83149e1296