Merge pull request #8199 from keszybz/small-things

Sundry small cleanups

diff --cc src/core/main.c
Simple merge

diff --cc src/core/manager.c
Simple merge

diff --cc src/core/unit.c
Simple merge

diff --cc src/login/logind.c
Simple merge