Merge branch 'stable-3.1' into master

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

Change-Id: Id3b17a824fea0e82e16014e32677f9b2b90711d6