Merge r16894, r16896, r16897 from trunk.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16898 af4574ff-66df-0310-9fd7-8a98e5e911e0