Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes