Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials