Merge "Add wait_for_server_termination in test_server_basic_ops"