Merge branch 'stable-3.0'

* stable-3.0:
  Update Gerrit API to 3.0.6
  Update Gerrit API to 2.16.15

Change-Id: I35db0de7f00bb9710dfd672ceb7b23574aa01bdf