Merge changes Ib5012456,Idbfb49c2,Ieb953c18

* changes:
  Use uid_t for user IDs and gid_t for group IDs
  Fix cgroup directory permissions
  Simplify cgroups.json