Merge pull request #1275 from keveman/grpc_support

Fixed grpc C++ plugin support.