Fixing thread pinning hickups releated to cgroups
Fixing merge error