Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.11.3

Change-Id: I01df42cc11db29d506126847adf54a55f7c6f5be