Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Use Gerrit 2.16.19 in Dockerfile

Change-Id: I55c01d07120f2b5d155985c7404c0b8b6476e543