Merge changes from trunk r16889, r16890, and r16892.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16893 af4574ff-66df-0310-9fd7-8a98e5e911e0