Select correct device

When a repository for common hardware is selected, override the
selection and select a device that is dependant of that repository.

This fixes Cid failures for common hardware repositories that offer
device-specific apps ('Advanced settings').
Disambiguate shared repositories

Since some of these may happen on multiple vendors, include the vendor
in the match string
Merge branch 'master' of git://github.com/CyanogenMod/hudson