fix to cleanup_fail talking @ wrong kind of disk device node, be more explicit about cloud_target/image_build in various places