Merge "Add support for optional cgroup attributes"