Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Adapt to changes in Gerrit core Adapt to changes in Gerrit core Change-Id: I5e1cbf15f66668b6992dcda18e961f2988a90bef