apply "blead only" commits to File-Path

These two commits were made in perl5.git, but never backported to File-Path.  Enjoy!