tree b8231b686db3b7ed870f257a28152e8bf739b2b3
parent 1b4704ab3bf274b6005230fe071fc073923b515b
parent 4d8740c954db9577151808cf3bb2ebc27e0b19e8
author Marco Miller <marco.miller@ericsson.com> 1580762908 -0500
committer Marco Miller <marco.miller@ericsson.com> 1580762908 -0500

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade wiremock to 2.26.0

Change-Id: I0738996c4dd6de6c032564c871ab9094c7026b6c