Allow armaments to be enabled/disabled by upgrades.
Merge pull request #6576 from pchote/armaments

Allow armaments to be enabled/disabled by upgrades.