Merge "RpcServer::establishConnection: make static"