Resolved merge conflict with master

BUILD

Makefile

binding.gyp

build.yaml

examples/cpp/helloworld/Makefile

examples/cpp/route_guide/Makefile

gRPC.podspec

grpc.def

grpc.gemspec

include/grpc/census.h

include/grpc/impl/codegen/compression_types.h

include/grpc/impl/codegen/port_platform.h

include/grpc/impl/codegen/propagation_bits.h

package.json

setup.py

src/core/census/context.c

src/core/census/placeholders.c

src/core/census/tag_set.c

src/core/security/server_secure_chttp2.c

src/python/grpcio/commands.py