Merge pull request #2665 from ehelms/bastion

Bastion - Merging master into branch.
Bastion: Updating spec file to include bastion files.