Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade testcontainers to 1.11.1

Change-Id: Ib77257b5970fbcf04d39d6c062fa8429f6b605f1