errors (hopefully) fixed and XMI regenerated
Authored by: mikeward 2020-02-14
Parent: [r5604]
Child: [r5606]