Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Use Gerrit 2.16.18 in Dockerfile

Change-Id: I27e52e625cec859ec0e1b157cd220ebc8710fe9e