associations fixed and XMI regenerated
Authored by: mikeward 2020-01-28
Parent: [r5528]
Child: [r5530]