Update buildbot_tool and builders.pyl templates to remove 'master_type'.

scripts/master/unittests/master_gen_test.py

Index: scripts/master/unittests/master_gen_test.py
diff --git a/scripts/master/unittests/master_gen_test.py b/scripts/master/unittests/master_gen_test.py
index c1680f133ca9533a0a71958b692ee9de3091db27..cd3808635af5625e55edc40fda847a0f5a3c5ea0 100755
--- a/scripts/master/unittests/master_gen_test.py
+++ b/scripts/master/unittests/master_gen_test.py
@@ -84,25 +84,6 @@ class PopulateBuildmasterConfigTest(unittest.TestCase):
     finally:
       os.remove(fp.name)
 
-  def test_tryserver(self):

[Dirk Pranke, 2015/05/29 01:55:38]

We'll add an equivalent test back in the follow up patch, but in this CL it
wasn't testing anything interesting.

-    try:
-      contents = SAMPLE_BUILDERS_PY.replace('waterfall', 'tryserver')
-      fp = tempfile.NamedTemporaryFile(delete=False)
-      fp.write(contents)
-      fp.close()
-
-      c = {}
-      master_gen.PopulateBuildmasterConfig(c, fp.name, _FakeMaster)
-
-      self.assertEqual(len(c['builders']), 1)
-      self.assertEqual(c['builders'][0]['name'], 'Test Linux')
-
-      self.assertEqual(len(c['change_source']), 0)
-      self.assertEqual(len(c['schedulers']), 1)
-    finally:
-      os.remove(fp.name)
-
-
 
 if __name__ == '__main__':
   unittest.TestCase.maxDiff = None