imaging: Refs #2099 Fix hard drives and partitions order