Bastion: re-enable jshint and fix jshint errors.
Merge pull request #2473 from waldenraines/bastion-jshint

Bastion: re-enable jshint and fix jshint errors.
Bastion: moving over org switcher and adding tests.