Resolved merge conflicts with master

BUILD

Makefile

build.json

gRPC.podspec

include/grpc++/completion_queue.h

include/grpc++/impl/call.h

include/grpc++/impl/rpc_service_method.h

include/grpc++/server.h

include/grpc++/server_context.h

include/grpc/byte_buffer.h

include/grpc/grpc.h

include/grpc/grpc_zookeeper.h

include/grpc/support/port_platform.h

include/grpc/support/sync.h

src/compiler/csharp_generator_helpers.h

src/compiler/generator_helpers.h

src/compiler/objective_c_generator.cc

src/compiler/objective_c_plugin.cc

src/core/client_config/resolvers/zookeeper_resolver.c

src/core/client_config/resolvers/zookeeper_resolver.h