tree bd033d01946571fde2d58eeb54049166254f0a59
parent 722afe8cef90a7416dcb71eee078378d82dfb3b2
parent cb804145fbd58f537ac1c29295ba90d67f39d662
author Marco Miller <marco.miller@ericsson.com> 1553024004 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553025371 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade wiremock to 2.22.0
  Upgrade mockito-core to 2.25.1

Change-Id: I683a4439f6304ecd42b14460bcf3dddaa342f833