Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15