Cleaned up merge.
Add two changes supplied by Martin Siegert. One fixes a problem of cpuset knowledge not being adequately recorded for sister nodes, another fixes an issue with whitespace in ranges for cpus specified in cpuset files. Also add a unit test for the latter.
cleaned up merge.