Merge remote branch 'cros/upstream' into tempbranch3

server/server_job.py

Index: server/server_job.py
diff --git a/server/server_job.py b/server/server_job.py
index 757257fff1df866ca618dec268eea0838da12264..6ef59debc57b8b2d9d2abc662c54711cc5b9fa38 100644
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -542,10 +542,12 @@ class base_server_job(base_job.base_job):
 
                 # no error occured, so we don't need to collect crashinfo
                 collect_crashinfo = False
-            except:
+            except Exception, e:
                 try:
                     logging.exception(
                             'Exception escaped control file, job aborting:')
+                    self.record('INFO', None, None, str(e),
+                                {'job_abort_reason': str(e)})
                 except:
                     pass # don't let logging exceptions here interfere
                 raise