Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I423e639af3a8fa861ee125341b59127a7fc7cd73