Fix imports and bring over a missing file.

masters/master.chromiumos/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This is the buildmaster config file for the 'chromeos' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
@@ skipping 12 matching lines @@
 # os = xp/vista/linux/mac
 # type = perf/tests/full/jsc/webkit_latest
 
 from buildbot import locks
 from buildbot.changes.pb import PBChangeSource
 from buildbot.steps import shell
 from buildbot.scheduler import Dependent
 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
 
 # This is the dictionary that the buildmaster pays attention to. We also use
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
 
 ####### CHANGESOURCES
@@ skipping 467 matching lines @@
       'Chromium Linux': ['unit_tests'],
     }
   c['status'].append(goodrevisions.GoodRevisions(
       good_revision_steps=good_revision_steps))
 
 
 ####### PROJECT IDENTITY
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromiumos/'