Fix imports and bring over a missing file.

masters/master.chromiumos/master.cfg

Index: masters/master.chromiumos/master.cfg
===================================================================
--- masters/master.chromiumos/master.cfg	(revision 62490)
+++ masters/master.chromiumos/master.cfg	(working copy)
@@ -30,24 +30,17 @@
 from buildbot.scheduler import Scheduler
 from buildbot.scheduler import Triggerable
 
-# Reload all the python files under master and common
-import master
-reload(master)
-import common
-reload(common)
-
 # These modules come from scripts/master, which must be in the PYTHONPATH.
-import build_utils
-import chromium_step
-from factory import chromeos_factory
-import master_utils
-import slaves_list
+from master import build_utils
+from master import chromium_step
+from master import master_utils
+from master import slaves_list
+from master.factory import chromeos_factory
 
 # These modules come from scripts/common, which must be in the PYTHONPATH.
-import chromium_config as config
-import chromium_utils
+import config
 
-ActiveMaster = config.Master.ChromeOS
+ActiveMaster = config.Master.ChromiumOS
 
 TREE_GATE_KEEPER = ActiveMaster.is_production_host
 GOOD_REVISIONS = False