Merge pull request #9157 from poettering/unit-config-load-error

introduce a new "bad-setting" unit load state in order to improve "systemctl status" output when bad settings are used

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

diff --cc src/systemctl/systemctl.c
Simple merge