Merge pull request #4366 from Montellese/uriutils_resolvepath_fix