Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.25.1

Change-Id: I997b2403085897bb4429178248f482a2c12e07d3