Merge remote branch 'cros/upstream' into tempbranch3

scheduler/monitor_db.py

Index: scheduler/monitor_db.py
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 5b7e593e4f0aa14362f747099849a2a236036996..2d878bbf50dfd1d8b9619e4887d9add05eee7638 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -7,7 +7,7 @@ Autotest scheduler
 
 import common
 import datetime, errno, optparse, os, pwd, Queue, re, shutil, signal
-import smtplib, socket, stat, subprocess, sys, tempfile, time, traceback
+import smtplib, socket, stat, subprocess, sys, tempfile, time, traceback, urllib
 import itertools, logging, weakref, gc
 
 import MySQLdb
@@ -1823,6 +1823,7 @@ class TaskWithJobKeyvals(object):
         keyval_path = os.path.join(self._working_directory(), 'host_keyvals',
                                    host.hostname)
         platform, all_labels = host.platform_and_labels()
+        all_labels = [ urllib.quote(label) for label in all_labels ]
         keyval_dict = dict(platform=platform, labels=','.join(all_labels))
         self._write_keyvals_before_job_helper(keyval_dict, keyval_path)