Merge branch 'stable-3.6'

* stable-3.6:
  Format with GJF 1.7
  Fix creating top menu entry for serviceuser plugin
  Fix headers in Service User UI
  Fix capability check in UI
  Use com.google.gerrit.entities.InternalGroup

Change-Id: I5ce51a5bce82912663e8220ba97c5f6786615d55