regenerated EMV2 after genmodel corrections in aadl2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	org.osate.xtext.aadl2.errormodel/src-gen/org/osate/xtext/aadl2/errormodel/errorModel/ErrorModelPackage.java