Comment 3 for bug 2063849

Grabbing this ticket again to rebase on the new branch for bug 2062917, which restores the ability to show combined org name + org shortname in the catalog org selector.