r20116: Start merging in the work done to create the new idmap subsystem.