Merge change 20020

* changes:
  Improvements to cgroup stuff.