Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.23.2

Change-Id: I9dd8080d4fcb59aa69961713249fea66a7f9478b