Merge branch 'master' into metrics_typo

Makefile

include/grpc/grpc.h

include/grpc/impl/codegen/grpc_types.h

src/core/ext/resolver/sockaddr/sockaddr_resolver.c

src/core/lib/client_config/subchannel.c

src/core/lib/surface/server.c

src/cpp/server/server.cc

src/csharp/Grpc.IntegrationTesting/ClientRunners.cs

...rp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj

src/csharp/Grpc.IntegrationTesting/InterarrivalTimers.cs

src/proto/grpc/testing/messages.proto

src/proto/grpc/testing/test.proto

src/python/grpcio/grpc/_cython/imports.generated.h

src/ruby/ext/grpc/rb_call.c

src/ruby/ext/grpc/rb_grpc_imports.generated.h

src/ruby/spec/generic/client_stub_spec.rb

test/core/bad_client/bad_client.c

test/core/bad_client/gen_build_yaml.py

test/core/bad_client/tests/head_of_line_blocking.c

test/core/surface/server_test.c