[Git][pacman/pacman][master] Partially revert resolving paths in pacman.conf