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

masters/master.client.catapult/builders.pyl

Index: masters/master.client.catapult/builders.pyl
diff --git a/masters/master.client.catapult/builders.pyl b/masters/master.client.catapult/builders.pyl
index 40b860a459d0185b745301391ecf14084081e054..e38b12c41be489b8217b72673a0e28abb8210dc8 100644
--- a/masters/master.client.catapult/builders.pyl
+++ b/masters/master.client.catapult/builders.pyl
@@ -21,7 +21,6 @@
   "master_classname": "Catapult",
   "master_port": 20303,
   "master_port_alt": 40303,
-  "master_type": "waterfall",
   "slave_pools": {
     "linux_slave_pool": {
       "slave_data": {
@@ -50,4 +49,4 @@
   },
   "slave_port": 30303,
   "templates": ["../master.chromium/templates"],
-}
+}