Fix regressions introduced by previous commit

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