tree c6bc63c02c22e7dfd22d2b32ea4e6b2b0bf2a53a
parent 081607e6e9e64716893b24d5aac6f9b6009b3e6c
parent ecc4881918ada52f75b331f5d610e60323300204
author Marco Miller <marco.miller@ericsson.com> 1546868334 -0500
committer Marco Miller <marco.miller@ericsson.com> 1546868387 -0500

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.20.0

Change-Id: I719ba05ce48efa9c6a6b2a3ee143e7194aa99944