Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set Gerrit to 2.15.18
  Set Gerrit to 2.15.17

Change-Id: Ia7b5d4fe13a1d0a7f267862f7310b827d4ff4f79