Change menus and org switcher locators to match katello/master