Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Use Gerrit 3.0.9 in Dockerfile
  Use Gerrit 2.16.19 in Dockerfile

Change-Id: I9b7bcae495b504654fb2fc48df3b6e5550c5f3d6