Merge change 3725 into donut

* changes:
  process: Clean up cgroup management