Merge "Allow https URIs in convertUriToPath"