Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade wiremock to 2.25.1

Change-Id: I1eafeb760f52616dab81d2e8afc9ab1d412b4047