Moving and changing cardinality of Veteran Status, Disabling Condition, and Housing Status per: https://github.com/hmis-interop/xml/issues/17