Ml2

composition layer changes to allow enabling / disabling support for ml2 configs