Merge remote-tracking branch 'origin/master' into swaggerlikeus

Conflicts:
	endpoints/api.py

endpoints/api/build.py

@@ -52,10 +52,10 @@ def build_status_view(build_obj, can_write=False):
   logger.debug('Can write: %s job_config: %s', can_write, build_obj.job_config)
   resp = {
     'id': build_obj.uuid,
-    'phase': build_obj.phase,
+    'phase': build_obj.phase if status else 'cannot_load',
     'started': format_date(build_obj.started),
     'display_name': build_obj.display_name,
-    'status': status,
+    'status': status or {},
     'job_config': get_job_config(build_obj) if can_write else None,
     'is_writer': can_write,
     'trigger': trigger_view(build_obj.trigger),