systemd: stabilize 215, include bug fixes from upstream.
Merge pull request #736 from marineam/systemd

systemd: stabilize 215, include bug fixes from upstream.