Merge github.com:grpc/grpc into c++api

test/core/end2end/gen_build_json.py

@@ -32,7 +32,6 @@ END2END_TESTS = [
     'ping_pong_streaming',
     'request_response_with_binary_metadata_and_payload',
     'request_response_with_metadata_and_payload',
-    'request_response_with_metadata_and_payload',
     'request_response_with_payload',
     'request_with_large_metadata',
     'request_with_payload',

tools/run_tests/tests.json

@@ -361,10 +361,6 @@
     "language": "c", 
     "name": "chttp2_fake_security_request_response_with_metadata_and_payload_test"
   }, 
-  {
-    "language": "c", 
-    "name": "chttp2_fake_security_request_response_with_metadata_and_payload_test"
-  }, 
   {
     "language": "c", 
     "name": "chttp2_fake_security_request_response_with_payload_test"
@@ -553,10 +549,6 @@
     "language": "c", 
     "name": "chttp2_fullstack_request_response_with_metadata_and_payload_test"
   }, 
-  {
-    "language": "c", 
-    "name": "chttp2_fullstack_request_response_with_metadata_and_payload_test"
-  }, 
   {
     "language": "c", 
     "name": "chttp2_fullstack_request_response_with_payload_test"
@@ -745,10 +737,6 @@
     "language": "c", 
     "name": "chttp2_simple_ssl_fullstack_request_response_with_metadata_and_payload_test"
   }, 
-  {
-    "language": "c", 
-    "name": "chttp2_simple_ssl_fullstack_request_response_with_metadata_and_payload_test"
-  }, 
   {
     "language": "c", 
     "name": "chttp2_simple_ssl_fullstack_request_response_with_payload_test"
@@ -937,10 +925,6 @@
     "language": "c", 
     "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_metadata_and_payload_test"
   }, 
-  {
-    "language": "c", 
-    "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_metadata_and_payload_test"
-  }, 
   {
     "language": "c", 
     "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_response_with_payload_test"
@@ -1129,10 +1113,6 @@
     "language": "c", 
     "name": "chttp2_socket_pair_request_response_with_metadata_and_payload_test"
   }, 
-  {
-    "language": "c", 
-    "name": "chttp2_socket_pair_request_response_with_metadata_and_payload_test"
-  }, 
   {
     "language": "c", 
     "name": "chttp2_socket_pair_request_response_with_payload_test"
@@ -1321,10 +1301,6 @@
     "language": "c", 
     "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_test"
   }, 
-  {
-    "language": "c", 
-    "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_metadata_and_payload_test"
-  }, 
   {
     "language": "c", 
     "name": "chttp2_socket_pair_one_byte_at_a_time_request_response_with_payload_test"