Merge pull request #29249 from poettering/pid1-error-message

pid1: refactoring of unit state machine logging and unit timer refactoring

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

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

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