Reland of rename existing Blink try bots to include OS version.

scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_win7_blink_dbg.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
     ],
     "name": "taskkill"
   },
   {
@@ skipping 19 matching lines @@
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--master",
       "tryserver.blink",
       "--builder",
-      "win_blink_dbg",
+      "win7_blink_dbg",
       "--slave",
       "TestSlavename",
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
       "[GIT_CACHE]",
@@ skipping 178 matching lines @@
       "-u",
       "[BUILDER_CACHE]\\win_layout\\src\\testing\\scripts\\get_compile_targets.py",
       "--output",
       "/path/to/tmp/json",
       "--",
       "--build-config-fs",
       "Debug",
       "--paths",
       "{\"checkout\": \"[BUILDER_CACHE]\\\\win_layout\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
       "--properties",
-      "{\"buildername\": \"win_blink_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
+      "{\"buildername\": \"win7_blink_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.blink\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
@@ skipping 99 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]\\win_layout\\src\\tools\\mb\\mb.py",
       "gen",
       "-m",
       "tryserver.blink",
       "-b",
-      "win_blink_dbg",
+      "win7_blink_dbg",
       "--config-file",
       "[BUILDER_CACHE]\\win_layout\\src\\tools\\mb\\mb_config.pyl",
       "--goma-dir",
       "[CACHE]\\cipd\\goma",
       "//out/Debug"
     ],
     "cwd": "[BUILDER_CACHE]\\win_layout\\src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
@@ skipping 60 matching lines @@
       "[SLAVE_BUILD]\\layout-test-results",
       "--build-dir",
       "[BUILDER_CACHE]\\win_layout\\src\\out",
       "--json-test-results",
       "/path/to/tmp/json",
       "--test-results-server",
       "test-results.appspot.com",
       "--build-number",
       "571",
       "--builder-name",
-      "win_blink_dbg",
+      "win7_blink_dbg",
       "--step-name",
       "webkit_tests (with patch)",
       "--master-name",
       "tryserver.blink",
       "--debug-rwt-logging"
     ],
     "cwd": "[BUILDER_CACHE]\\win_layout",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "webkit_tests (with patch)",
     "~followup_annotations": [
       "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\chromium\\archive_layout_test_results.py",
       "--results-dir",
       "[SLAVE_BUILD]\\layout-test-results",
       "--build-dir",
       "[BUILDER_CACHE]\\win_layout\\src\\out",
       "--build-number",
       "571",
       "--builder-name",
-      "win_blink_dbg",
+      "win7_blink_dbg",
       "--gs-bucket",
       "gs://chromium-layout-test-archives",
       "--staging-dir",
       "[CACHE]\\chrome_staging"
     ],
     "cwd": "[BUILDER_CACHE]\\win_layout",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "archive_webkit_tests_results",
     "~followup_annotations": [
-      "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win_blink_dbg/571/layout-test-results/results.html@@@",
-      "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/win_blink_dbg/571/layout-test-results.zip@@@"
+      "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/win7_blink_dbg/571/layout-test-results/results.html@@@",
+      "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/win7_blink_dbg/571/layout-test-results.zip@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
       "--target",
       "Debug"
     ],
     "cwd": "[BUILDER_CACHE]\\win_layout",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "process_dumps"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]