icse15: Fix missing formula var in Ecore model

 * Port fixes back to MODELS13