Just disable force to ensure that bot_update really is running everywhere.

recipe_modules/bot_update/resources/bot_update.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 1680 matching lines @@
   print ACTIVATED_MESSAGE if active else NOT_ACTIVATED_MESSAGE
 
 
 def main():
   # Get inputs.
   options, _ = parse_args()
   builder = options.builder_name
   slave = options.slave_name
   master = options.master
 
-  if not master:
-    # bot_update activation whitelist is checked only on buildbot masters.
-    # If there is no master, bot_update is always active.
-    options.force = True
+  # Always run. This option will be removed in a later CL, but for now make sure
+  # that bot_update is ALWAYS set to run, no matter what.
+  options.force = True
 
   # Check if this script should activate or not.
   active = options.force or check_valid_host(master, builder, slave)
 
   # Print a helpful message to tell developers whats going on with this step.
   print_help_text(
       options.force, options.output_json, active, master, builder, slave)
 
   # Parse, munipulate, and print the gclient solutions.
   specs = {}
@@ skipping 28 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())