fixing conflicts with new upstream master

BUILD

CMakeLists.txt

Makefile

binding.gyp

build.yaml

config.m4

gRPC-Core.podspec

gRPC-ProtoRPC.podspec

gRPC-RxLibrary.podspec

gRPC.podspec

grpc.def

grpc.gemspec

include/grpc++/resource_quota.h

include/grpc++/server_builder.h

include/grpc++/support/channel_arguments.h

include/grpc/grpc.h

include/grpc/impl/codegen/grpc_types.h

package.json

package.xml

src/compiler/ruby_generator.cc