Simplify an if statement

Signed-off-by: John Else <john.else@citrix.com>
CA-140331: Relax merging of pci databases

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

Signed-off-by: John Else <john.else@citrix.com>
Add another Pci_db merging test

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1828 from johnelse/ca-140331-xs64bit

CA-140331: Relax merging of pci databases