Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I533e00935dd479735e50bdab0ef6ba16466dca56