Fixup missing catalog's in arch root
Fixup problems with huybrid packages
Ensure that all roots are the same at end of bootstraping