merge & resolve conflicts

BUILD

Makefile

binding.gyp

build.yaml

gRPC.podspec

src/core/channel/client_uchannel.c

src/core/channel/client_uchannel.h

src/core/client_config/subchannel.c

src/core/client_config/subchannel.h

src/core/surface/channel_connectivity.c

src/php/README.md

src/php/bin/run_gen_code_test.sh

src/php/bin/run_tests.sh

src/php/lib/Grpc/BaseStub.php

src/php/phpunit.xml

src/php/tests/bootstrap.php

src/php/tests/generated_code/AbstractGeneratedCodeTest.php

src/php/tests/generated_code/GeneratedCodeTest.php

...hp/tests/generated_code/GeneratedCodeWithCallbackTest.php

test/core/end2end/fixtures/h2_uchannel.c