Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes

grpc.gemspec

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

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

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

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

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

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

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

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

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

src/compiler/cpp_generator.cc

src/ruby/lib/grpc/generic/rpc_server.rb

src/ruby/spec/generic/rpc_server_pool_spec.rb

src/ruby/spec/generic/rpc_server_spec.rb

templates/grpc.gemspec.template

test/cpp/codegen/compiler_test_golden

test/cpp/end2end/hybrid_end2end_test.cc

test/cpp/end2end/mock_test.cc