1017396 - unable to import certv3 subscriptions from linked
distributor
Merge pull request #3234 from komidore64/distributor-failsauce

1017396 - unable to import certv3 subscriptions from linked distributor
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.
Bastion: Converting Menu to loaded HTML.