Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.21.0

Change-Id: I927e91d95308d8b2d1227db0b4e4cd1d197f1b42