OS-2605 amr too easily confused by Dell PCI SSPID reuse