backport file-descriptor limit fix

sending a PR from my personal fork since i do not seem to have r/w access to our fork.

this also pulls in new patches from upstream (the 44.23.fc17 build of systemd)