Fixed issue with clashing xml repository ids causing unintended overwrites (fixes #507)