Merge remote branch 'cros/upstream' into tempbranch

BUG=
TEST=

Review URL: http://codereview.chromium.org/4823005

Change-Id: I5d56f1c10d0fce7f9d7dc3ad727ea52dcb9b2d6c
diff --git a/scheduler/scheduler_config.py b/scheduler/scheduler_config.py
index 23fb0ea..fdc1001 100644
--- a/scheduler/scheduler_config.py
+++ b/scheduler/scheduler_config.py
@@ -16,6 +16,7 @@
               'secs_to_wait_for_atomic_group_hosts':
                   'secs_to_wait_for_atomic_group_hosts',
               'reverify_period_minutes': 'reverify_period_minutes',
+              'reverify_max_hosts_at_once': 'reverify_max_hosts_at_once',
              }