cosmetics
Merge remote-tracking branch 'forge/2.3.x' into 2.3.x
split PCIID into VENDORID and PRODUCTID

This is more consistent with USB devices.