Fix to include ml2 class groups and other needed mappings so

monolythic setup doesnt conflict with ml2.
I don't think it's actually necessary to comment out the above...it's harmless to leave them if you're using ml2 I believe.