Merge remote-tracking branch 'mkp-scsi/4.6/scsi-fixes' into misc