Fix to include ml2 class groups and other needed mappings so

monolythic setup doesnt conflict with ml2.
I'm wondering if there's any reason not to uncomment this by default (one less thing for ML2 users to have to configure, and for non-ML2 users I think it's harmless).