Issue222 dymola2015

Merged changes for dymola 2015 to avoid errors during pedantic check, and warnings during regular checks.