Bastion: replacing haml org switcher with html org switcher.

Also adding fliter capability to resolve BZ #980160.
Merge pull request #3245 from waldenraines/org-switcher

Bastion: replacing haml org switcher with html org switcher.