Adjust master_gen.PopulateBuildmasterConfig() to look at master_site_config

masters/master.client.catapult/master.cfg

Index: masters/master.client.catapult/master.cfg
diff --git a/masters/master.client.catapult/master.cfg b/masters/master.client.catapult/master.cfg
index f9400752518b83893af01f43b4b92b041726cabd..7e7a51b5d648d83f7f17833a04a012557f552779 100644
--- a/masters/master.client.catapult/master.cfg
+++ b/masters/master.client.catapult/master.cfg
@@ -10,6 +10,8 @@
 
 import os
 
+import master_site_config
+
 # This module comes from scripts/, which must be in the PYTHONPATH.
 from master import master_gen
 
@@ -20,4 +22,5 @@ BuildmasterConfig = {}
 
 master_gen.PopulateBuildmasterConfig(
     BuildmasterConfig,
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'))
+    os.path.join(os.path.dirname(os.path.abspath(__file__)), 'builders.pyl'),
+    master_site_config.Catapult)