Adjust master_gen.PopulateBuildmasterConfig() to look at master_site_config

masters/master.client.gyp/master.cfg

Index: masters/master.client.gyp/master.cfg
diff --git a/masters/master.client.gyp/master.cfg b/masters/master.client.gyp/master.cfg
index 5bbb0f262c0630d7ac7c3f6982b0b00efdbb1f63..8f540fd0ae9da04d1511f26f05ae9481e8344859 100644
--- a/masters/master.client.gyp/master.cfg
+++ b/masters/master.client.gyp/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.GYP)