Fix to include ml2 class groups and other needed mappings so

monolythic setup doesnt conflict with ml2.
Ditto here...do these actually need to be commented out by default?