Merge pull request #15692 from keszybz/preset-cleanup

Make systemctl list-unit-files output more useful

diff --cc man/systemctl.xml
Simple merge

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

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