Merge pull request #8314 from poettering/rearrange-stdio

refactor how we rearrange fds for stdin/stdout/stderr

diff --cc src/basic/terminal-util.h
Simple merge

diff --cc src/libsystemd/sd-bus/bus-message.c
Simple merge

diff --cc src/libsystemd/sd-bus/bus-socket.c
Simple merge