Modified risk and model schemas (#732)

Issue: 
As discussed in ticket #731 , this PR is a review of the schema

Model schema reviewed to ensure no data loss
Risk schema changes done based on risk and compliance tooling taxonomies
to ensure compatibility (including data classification etc)

This PR is to use for discussion on the TM-BOM discussion 0 not for
merging yet

Author: stevespringett