Fixes #5913, BZ1093601 let org-switcher clear URLs pass through bastion.

See also PR #4137 which only allowed org/location selection URLs
to pass through bastion.  This adds org/location "clear" URLs as well.