Fix to include ml2 class groups and other needed mappings so

monolythic setup doesnt conflict with ml2.
This might be another spot where we could leave it uncommented by default...harmless for folks not using ML2, saves a bit of work for those who are.