Resolve a couple of conflicts between the 5.12 fixes branch and the
5.13 staging tree (iSCSI target and UFS).
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>