tree 78d23577129c44a46db4c444986102a02684d5c8
parent 42d5a1eeb42535047f908d5b1651931c72d7874a
parent 7f46a10b0bdac9035cdd513b9fa50ea54fb17972
author David Pursehouse <dpursehouse@collab.net> 1553015386 +0000
committer David Pursehouse <dpursehouse@collab.net> 1553015386 +0000

Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I18978b85d9feecdeef193d6bdf60e52397c4d1b0