Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Adapt to the latest Gerrit on stable-2.14

Change-Id: Ic4cd8d15bd40f90ba248a657399c2e135e346804