Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade testcontainers to 1.11.1

Change-Id: Id54d8ac16c7b83c406db03d3cf9bf9d5b896c6a2