testing: update reference to swarming client in merge scripts

python client is being deprecated.

Bug: 984869
Change-Id: I43f7a74e1d5a108b378748a7a89f23ced37eb417
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033005
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737343}

testing/merge_scripts/standard_gtest_merge.py

@@ -42,7 +42,7 @@ def merge_shard_results(summary_json, jsons_to_merge):
   Returns dict with merged test output on success or None on failure. Emits
   annotations.
   """
-  # summary.json is produced by swarming.py itself. We are mostly interested
+  # summary.json is produced by swarming client itself. We are mostly interested
   # in the number of shards.
   try:
     with open(summary_json) as f:

testing/merge_scripts/standard_isolated_script_merge.py

@@ -20,7 +20,7 @@ def StandardIsolatedScriptMerge(output_json, summary_json, jsons_to_merge):
       written.
     jsons_to_merge: A list of paths to JSON files that should be merged.
   """
-  # summary.json is produced by swarming.py itself. We are mostly interested
+  # summary.json is produced by swarming client itself. We are mostly interested
   # in the number of shards.
   try:
     with open(summary_json) as f:
@@ -28,7 +28,7 @@ def StandardIsolatedScriptMerge(output_json, summary_json, jsons_to_merge):
   except (IOError, ValueError):
     print >> sys.stderr, (
         'summary.json is missing or can not be read',
-        'Something is seriously wrong with swarming_client/ or the bot.')
+        'Something is seriously wrong with swarming client or the bot.')
     return 1
 
   missing_shards = []