base

Merge change 24609 into eclair

* changes:
  If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the  event again.