CRM-12160 menu fixes for 4.3