Merge SCSI misc branch into isci-for-3.6 tag