T3-954: Handle any non-double-escaping in zippath.toUri()