Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I8439caf3028b640f97ea4685dd2c6b1ccbdb06db