Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Use Gerrit 2.15.18 in Dockerfile

Change-Id: I80d3be6cbfb56ba28de7ee50354ff52b315f3141