Bastion: moving over org switcher and adding tests.
Merge pull request #2463 from waldenraines/bastion

Bastion: moving over org switcher and adding tests.