Merge pull request #3035 from ctiller/naming-crisis

include/grpc/grpc.h

include/grpc/grpc_security.h

src/core/channel/http_client_filter.c

src/core/client_config/resolver_factory.c

src/core/client_config/resolver_factory.h

src/core/client_config/resolver_registry.c

src/core/client_config/resolver_registry.h

src/core/client_config/resolvers/dns_resolver.c

src/core/client_config/resolvers/sockaddr_resolver.c

src/core/client_config/resolvers/zookeeper_resolver.c

src/core/surface/channel.c

src/core/surface/init.c

test/core/end2end/tests/default_host.c

test/cpp/end2end/generic_end2end_test.cc