Merge branch 'shape-recover-repack' of https://github.com/jef-n/gdal into shape-recover-repack

From: Even Rouault <even.rouault@mines-paris.org>

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@26155 f0d54148-0727-0410-94bb-9a71ac55c965
Shapefile: delete temporary .cpg file earlier in REPACK

From: Even Rouault <even.rouault@mines-paris.org>

git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@26157 f0d54148-0727-0410-94bb-9a71ac55c965