Merge pull request #10741 from LabNConsulting/chopps/critfixgrpc

critical fixes for grpc

diff --cc lib/northbound_grpc.cpp
index 34bb1e4986e99fe2e62a54cdd4c7888530d9beed,f5c2a91a50025f8c943ecce25b6683d32539d316..e2a6290035885fd5a08eee701cc3fd76abf9b6ef
--- 1/lib/northbound_grpc.cpp
--- 2/lib/northbound_grpc.cpp
+++ b/lib/northbound_grpc.cpp
@@@ -225,9 -234,8 +234,8 @@@ template <typename Q, typename S> clas
  
                pthread_cond_signal(&_tag->cond);
                pthread_mutex_unlock(&_tag->cmux);
 -              return 0;
 +              return;
        }
-       NewRpcState<Q, S> *orig;
  
        const char *name;
        grpc::ServerContext ctx;