Issue #2102521 by ianthomas_uk, tim.plunkett: Finish converting menu.module to CMI.