Bastion: Updating spec file to include bastion files.
Merge pull request #2667 from ehelms/bastion-rpm

Bastion: Updating spec file to include bastion files.
Bastion: prevent autoloading too many results, fixes #2636.
Merge branch 'master' of https://github.com/Katello/katello into bastion

Conflicts:
	spec/controllers/api/v1/systems_controller_spec.rb
Merge pull request #2683 from waldenraines/bastion-merge

Merge branch 'master' of https://github.com/Katello/katello into bastion
Bastion: allow directives to work with ui-router, fixes #2638 and #2686.
Merge pull request #2687 from waldenraines/bastion

Bastion: allow directives to work with ui-router, fixes #2638 and #2686.
Bastion: Adding new resources, re-factoring and updating inline
edits.