Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 2.16.23
  Update Gerrit API to 3.0.13

Change-Id: I285d6c82bdc75adaf393a1a674b34dbb0d50a8d6