ome-xml: Update generated model code (rebased onto develop)

As for PR360.