Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade wiremock to 2.21.0

Change-Id: I248c1fdc432af0fed149d76fa895f5259d43ad5b