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

* commit '2b5f5fb9d94d13809af6967fb3adb40669ddfb49':
  base logging: fix errno restoring, severity conditionality, dangling ifs