Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Use Gerrit 2.16.18 in Dockerfile

Change-Id: Iaf3f8ceb584b0f2f88dbab8a143180e45d02f625