Merge branch 'master' into cpu_usage2

.gitmodules

BUILD

CMakeLists.txt

Makefile

binding.gyp

build.yaml

config.m4

doc/cpp-style-guide.md

gRPC-Core.podspec

grpc.gemspec

include/grpc++/alarm.h

include/grpc++/channel.h

include/grpc++/ext/proto_server_reflection_plugin.h

include/grpc++/ext/reflection.grpc.pb.h

include/grpc++/ext/reflection.pb.h

include/grpc++/generic/async_generic_service.h

include/grpc++/generic/generic_stub.h

include/grpc++/impl/codegen/async_stream.h

include/grpc++/impl/codegen/async_unary_call.h

include/grpc++/impl/codegen/call.h