Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update Gerrit API to 3.0.11

Change-Id: I31c7738d4724c1da44317f3b0461d7cdc20f583e