tree cd181a890410c36eabfff52a7731716758b78a77
parent 594f6bb5e77a36148352911041909b7fcc611357
parent 533bd067e534d35c169dd356e8ac82fa500f56ad
author Marco Miller <marco.miller@ericsson.com> 1563568832 -0400
committer Marco Miller <marco.miller@ericsson.com> 1563568832 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade wiremock to 2.24.0

Change-Id: Id1e1f055b77413b86fcdf25483a475826dfe58f6