CA-142451: Failed to report all LUNs advertised on targets sharing the same IQN

Port from master to `xs64bit`