Bastion: Updating manifest to load individual modules and then require tree
for each.
Merge pull request #3115 from ehelms/manifest-refactor

Bastion: Updating manifest to load individual modules and then require t...