Merge OpenModelica branch. This contains general cleanup to allow pedantic model check.