remove fi instead of ci
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	org.osate.aadl2.errormodel.analysis/src/org/osate/aadl2/errormodel/analysis/PropagateErrorSources.java
Merge remote-tracking branch 'origin/develop' into develop