Merge "Remove cpusets and schedboost product variables"