Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.15.0
  Upgrade bazlets to latest stable-2.16 to build with 2.16.23 API

Change-Id: Ib93eaee49c80c09895a0717e1303f2e8281957b2