Merge branch 'master' into qps_logging

binding.gyp

build.yaml

include/grpc++/client_context.h

include/grpc++/server.h

package.json

src/core/surface/init.c

src/cpp/client/client_context.cc

src/cpp/server/server.cc

templates/binding.gyp.template

tools/buildgen/generate_projects.py

tools/run_tests/run_tests.py

tools/run_tests/sanity_tests.yaml