Merge pull request #7992 from nicolasnoble/manual-upmerge

BUILD

CMakeLists.txt

Makefile

Rakefile

build.yaml

examples/csharp/helloworld/Greeter/Greeter.csproj

...ples/csharp/helloworld/GreeterClient/GreeterClient.csproj

...ples/csharp/helloworld/GreeterServer/GreeterServer.csproj

examples/csharp/route_guide/RouteGuide/RouteGuide.csproj

...harp/route_guide/RouteGuideClient/RouteGuideClient.csproj

...harp/route_guide/RouteGuideServer/RouteGuideServer.csproj

setup.py

src/cpp/client/channel_cc.cc

src/cpp/client/credentials_cc.cc

src/cpp/common/completion_queue_cc.cc

src/cpp/server/server_cc.cc

src/cpp/util/byte_buffer_cc.cc

src/cpp/util/slice_cc.cc

src/cpp/util/time_cc.cc

src/csharp/ext/grpc_csharp_ext.c