Merge branch 'stable-3.6'

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

Change-Id: I655d9e9d976c6e246ea8f34ea40123d430384a47