Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade wiremock to 2.23.2

Change-Id: Iab81277c3a71f27c69d5d2f9aea65a2e5ebc0e81