Merge pull request #2298 from jestabro/disk-by-id
smoketest: T5607: support getting SCSI device by drive-id