Merge branch 'stable-2.16'

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

Change-Id: I683a4439f6304ecd42b14460bcf3dddaa342f833