[WIP] Prepare for CmfMenuBundle 2.0