port of systemd-non-services@jap#1977

morph027 wants to merge 2 commits intojordansissel:mainjordansissel/fpm:mainfrom

morph027:systemd-non-services@japmorph027/fpm:systemd-non-services@japCopy head branch name to clipboard