Merge r10995, r10996, and r10997 from trunk.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10998 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689