Merge canonicalizeRhoUrl with canonicalizeRhoPath