Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Use Gerrit 2.15.18 in Dockerfile
  Use Gerrit 2.16.15 in Dockerfile

Change-Id: Iadd87a667b765e0e7678100c564b7ed4ecb6f241