Merge pull request #2074 from dkincade/master

[BISERVER-12154] - Reverting changes put in for this case
[BISERVER-9352] - Corrected the properties and XUL file to display ellipsis on the menu items and not on the menu name (Help)