Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Bump to Gerrit 2.10.6 APIs

Change-Id: I55346419780396b46fe0e01fdf73a0b79016fb39