Includes converting the RESUME_SUBPAGE to MENUITEM_SUBPAGE

And getting the group subnav to use the same structure

behatnotneeded

Change-Id: Ia3bcb02030b5fe4deae47f20ff497dda55667d95
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>