Merge "Fix a race condition in test_create_delete_image()"