Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade wiremock to 2.21.0

Change-Id: I3276c970c2155da7c05648fd505ba35fd6fc3b51