GTiff: fix in SaveICCProfile() related to TIFFTAG_WHITEPOINT (trunk only, patch by cleo, #5425)

git-svn-id: https://svn.osgeo.org/gdal/trunk@27107 f0d54148-0727-0410-94bb-9a71ac55c965
OSR:add human readable names to proj4 parsing (#5370)

git-svn-id: https://svn.osgeo.org/gdal/trunk@27108 f0d54148-0727-0410-94bb-9a71ac55c965
OSR:add human readable names to proj4 parsing (#5370), missed file

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