Merge branch 'stable-2.15'

* stable-2.15:
  Adapt to changes in Gerrit core
  Adapt to changes in Gerrit core

Change-Id: I7d9063337b69e88b44a932065fbecc64e1126040