Merge trunk and systemd branch, part 1.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11405 af4574ff-66df-0310-9fd7-8a98e5e911e0