Remains to be tested to ensure everything came over cleanly, so please continue to withhold commits a little longer This commit was SVN r17632.
than relying on cnos to get the nid/pid map. This commit was SVN r17588.
This commit was SVN r17480.