Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set Gerrit to 2.15.19
  Set Gerrit to 2.14.21

Change-Id: I3344fd66c74e6c6492a87b0d3e668920419c2e7a