Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update Gerrit API to 2.15.19
  Update Gerrit API to 2.14.21

Change-Id: I8e8d66757a608d5c795d3d2d804b8aede8bfbdef