Feature #2212: IMAGE/FSTYPE and DISK/FORMAT now default to 'raw'