Fixes #4946/BZ1093601 - allow org-switcher urls to pass through angular.

This will prevent a redirect loop that occurs when switching orgs or
locations on a Bastion page.
Fixes #5703, prevent infinite loop on trailing slash.
Merge pull request #4137 from waldenraines/4946

Fixes #4946/BZ1093601 - allow org-switcher urls to pass through angular.
Merge pull request #4138 from waldenraines/5703

Fixes #5703, prevent infinite loop on trailing slash.