Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.23.2

Change-Id: I95a5a5a81fb11c66e5644ddf29a57f6626d62487