Merge pull request #17702 from rnhmjoj/master

Extend $SYSTEMD_COLORS to switch colors mode

diff --cc src/basic/log.c
Simple merge

diff --cc src/journal/journal-verify.c
Simple merge

diff --cc src/shared/json.c
Simple merge

diff --cc src/shared/logs-show.c
Simple merge