Merged Valves from Annex60

This is for OpenModelica compatibility.