VERT_CS: when importing from proj.4 put AXIS node after UNIT; COMPD_CS: when importing from EPSG:x+y, set a more meaningfull name for the COMPD_CS node

git-svn-id: https://svn.osgeo.org/gdal/trunk@26290 f0d54148-0727-0410-94bb-9a71ac55c965
Merge branch 'trunk' into trunk_mingw