merged r7069-r7070 from trunk
refs #1307: added support of 2D tables that actually degrade to 1D tables
refs #1307: added test models for 2D tables that actually degrade to 1D tables


git-svn-id: https://svn.modelica.org/projects/Modelica/branches/maintenance/3.2.1@7081 7ce873d0-865f-4ce7-a662-4bb36ea78beb