tree fbeaf32f07b9aa5d395b598abca4ad78be680504
parent 281295b7b259262e9d74413a670d3821be98cf37
parent 4582f6233f6ba52ba4644666cae316e5c2729229
author Marco Miller <marco.miller@ericsson.com> 1599859307 -0400
committer Marco Miller <marco.miller@ericsson.com> 1599859307 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade wiremock to 2.27.2

Change-Id: Ib2cdef38064d2009db643e8d6b6536206092a17e