Merge from openmodelica branch.

Fixed bugs detected by OpenModelica.
Introduced the package Buildings.Media.Interface.Choices as this package moved between MSL 3.2 and 3.2.1.