Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Set Gerrit to 3.0.12
  Set Gerrit to 2.16.22

Change-Id: Ibe7d021c45f87a22f25a49d09433543faf5cd57a