Merge remote-tracking branch 'upstream/master' into objc-test-fix

.gitignore

.pylintrc

CMakeLists.txt

Makefile

bazel/cc_grpc_library.bzl

bazel/generate_cc.bzl

bazel/grpc_build_system.bzl

build.yaml

doc/status_ordering.md

examples/csharp/helloworld-from-cli/global.json

gRPC-Core.podspec

gRPC-ProtoRPC.podspec

gRPC-RxLibrary.podspec

gRPC.podspec

grpc.def

include/grpc++/impl/channel_argument_option.h

include/grpc++/server_builder.h

include/grpc/impl/codegen/sync.h

include/grpc/support/sync.h

package.json