Backport pes_auvergne pg_restore fixes