Merge "Fix image_id KeyError in test_create_backup"