Merge "Associate the sysfs_block_type attribute with sysfs SCSI device information"