Added parents for Charlie's dscl workaround
This one is just too complex as it in fact covers three base revisions
Added additional parent mappings for 6.12 branch