Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.24.0

Change-Id: Id1e1f055b77413b86fcdf25483a475826dfe58f6