Fix to include ml2 class groups and other needed mappings so

monolythic setup doesnt conflict with ml2.
This could be left uncommented (one less thing for the user to do if deploying ml2).