Simplify an if statement

Signed-off-by: John Else <john.else@citrix.com>
(cherry picked from commit 5df6446448129a097c8337a9aabf565ba47a0030)
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>
(cherry picked from commit 90807ddbbed8993e8f12e694b24a56a352f93a43)
Add another Pci_db merging test

Signed-off-by: John Else <john.else@citrix.com>
(cherry picked from commit 4549499797cf7a6bbf7e21e70329286ae50b4dc0)
Merge pull request #1829 from johnelse/ca-140331

CA-140331: Relax merging of pci databases