Merge "base logging: fix errno restoring, severity conditionality, dangling ifs"