[FixRM #8318] - Use normalize_uri properly

normalize_uri should be used when paths are being merged, not after.
Land #2258, @wchen-r7's patch for [SeeRM #8318]