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: I430e64910a9f85bea3712b0c20a042072472d2e5