Attempt to fix timing issue with loading dashboard after login

Looks like this form submit does not use the usual jQuery ajax call, since we wait for all those to finish.  Trying to wait for the org switcher element to appear instead.
Fix two locators that were ambiguous after changes to the org switcher in katello
Fix uniqueifying content view defs, which i accidentally pushed too soon