[ros-diffs] [ion] 16197: Make scsi header um friendly