Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update Gerrit API to 2.14.21

Change-Id: I83d56c3bddb948239702f7647268893238e58226