Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.25.1

Change-Id: Ib4926324e578f3912e0cb56d00d0aca10081c2b3