Merge to trunk r17126
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17322 af4574ff-66df-0310-9fd7-8a98e5e911e0