Update STIX conceptual model based on reversed STIX

2-way mapping implied changes in both directions.
Merge branch 'master' of https://github.com/omg-threat-modeling/phase1