Merge changes I8a2764a6,I6e8b9d63,I6e041dfc

* changes:
  Canonicalize cgroup paths
  Micro-optimize MergeCgroupToDescriptors()
  Fix support for optional cgroup attributes