Merge to r17107. Did not merge gnome-terminal update. That is for DJ when he updates GNOME.
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17244 af4574ff-66df-0310-9fd7-8a98e5e911e0