[Merge] ~ddstreet/ubuntu/+source/systemd:ubuntu-kinetic into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-kinetic

[Nick Rosbrook]

I have included this change (with one minor adjustment to the commit message) in my PR here: https://code.launchpad.net/~enr0n/ubuntu/+source/systemd/+git/systemd/+merge/431363.
-- 
https://code.launchpad.net/~ddstreet/ubuntu/+source/systemd/+git/systemd/+merge/431071
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-kinetic.