[Bug 544524] Use unqiue keys / vendors per repository