Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.22.0
  Upgrade mockito-core to 2.25.1

Change-Id: I18978b85d9feecdeef193d6bdf60e52397c4d1b0