Merge "wahoo: explicit app access to cgroup"