This merges Annex60:issue27fmi

This is for https://github.com/lbl-srg/modelica-buildings/issues/313 and closes https://github.com/iea-annex60/modelica-annex60/issues/27 as the further development is on this repository