Merge "Avoid members with the same base name in ar's archives"