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

composer.json

doc/core/pending_api_cleanups.md

doc/cpp/pending_api_cleanups.md

examples/php/composer.json

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

include/grpc/impl/codegen/grpc_types.h

src/core/ext/client_config/client_channel.c

src/core/ext/client_config/lb_policy.h

src/core/ext/lb_policy/grpclb/grpclb.c

src/core/ext/transport/cronet/transport/cronet_transport.c

src/core/lib/iomgr/error.h

src/cpp/client/client_context.cc

src/cpp/common/channel_filter.h

src/csharp/Grpc.Tools.nuspec

src/php/composer.json

src/python/grpcio/grpc/_server.py

templates/composer.json.template

templates/src/php/composer.json.template

test/core/bad_ssl/bad_ssl_test.c

test/core/end2end/connection_refused_test.c