Backport to 9.2 the fixes for pkg.conf