Menu bar: Changed structure of menu include to be more appropriate for WAI-ARIA and hard-coded in WAI-ARIA attributes
Merge pull request #3161 from pjackson28/menufixes

Menu bar: Changed structure of menu include to be more appropriate for WAI-ARIA and hard-coded in WAI-ARIA attributes