TRQ-2022. Fix a problem with the merging of cpuset changes.
Merge branch 'master' of https://github.com/adaptivecomputing/torque