imaging: Refs #2099 Fixed disk and partition order