Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Set Gerrit to 2.14.21

Change-Id: I785a04a0c85e1679bac0e22e4d8a67e0a80cc6ac