Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 3.0.12
  Update Gerrit API to 2.16.22

Change-Id: Iff15703e5e68ed87dc1be900aca7b26e870fe6c6