adapted to new annex object order.
Regenerated from a minor meta model change in AADL2