[ocl25] Correct inconsistent declarations
[ocl25] Support generation of *CS.ecore from *.uml