associations fixed, and XMI regenerated
Authored by: mikeward 2020-01-27
Parent: [r5500]
Child: [r5502]