Merge "Fix FUSE_LOG_ERR handling"