Merged 2safedaemon and 2safefilesystem