Merges from trunk to r17100.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17231 af4574ff-66df-0310-9fd7-8a98e5e911e0