Merge "Assert volume deletion in test_image_defined_boot_from_volume"