Getting interstitial org switcher functional and related refactorings, fixes #2189.
Remove unused $location.
Merge pull request #2222 from waldenraines/fix_org_switcher_issues

Getting interstitial org switcher functional and related refactorings, fixes #2189.