Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade wiremock to 2.25.0
  Upgrade bazlets to latest stable-2.16 to build with 2.16.12 API
  Upgrade bazlets to latest stable-2.15 to build with 2.15.17 API

Change-Id: I771790eb567e24ebb6678134b338780a75856205