Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Use com.google.gerrit.entities.InternalGroup

Change-Id: I7e055c261e25dd5716b5519b1b9fa6b678d7e48b