Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.20.0

Change-Id: I719ba05ce48efa9c6a6b2a3ee143e7194aa99944