Issue #1007910 by lyricnz, idflood: Fixed D6->D7 update doesn't convert 'primary-links' menu to 'main-menu'.

Issue #761648 follow-up by lyricnz: Fixed Menu D6->D7 upgrade doesn't maintain node-menu configuration.