merge fix from master:Mellanox renamed their driver in later kernels.  If new name detected, substitute it.