CA-140331: Relax merging of pci databases

Allow subdevices to be merged into the primary database even if the
device names do not match.