Merge "Revert "Remove wait_for_server from create_image_from_server""