Merge github.com:grpc/grpc into windows-fixes

Conflicts:
	BUILD
	src/core/iomgr/tcp_server.h
	src/core/iomgr/tcp_server_posix.c
	src/core/iomgr/tcp_server_windows.c
	src/core/security/server_secure_chttp2.c
	src/core/surface/completion_queue.c
	src/core/surface/completion_queue.h
	src/core/surface/server.c
	test/core/end2end/tests/cancel_after_invoke.c
	test/core/end2end/tests/cancel_test_helpers.h
	tools/run_tests/tests.json
	vsprojects/vs2013/Grpc.mak