Merge "Fix test_rebuild_nonexistent_server"