fixed up SWID tags
Merge https://github.com/commoncriteria/application