Merge branch 'stable-3.4' into stable-3.5

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

Change-Id: I36cbd203f3b14a416f2d982ebb0f919d0051f77d