Last part of Capability Version File work

WS-245, WS-367:

• Manually added files override templates unless the templates are restricted as with condor submit files.
• Automatically adds previous version's files to new version