Merge "Fix Docstrings for test_server_basic_ops.py"