Fix two locators that were ambiguous after changes to the org switcher in katello