Merge "Delete snapshot in test_image_defined_boot_from_volume"