[Merge] ~ddstreet/ubuntu/+source/systemd:lp1835581-e-ucd into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-eoan

[Dan Streetman]

this is rebased on top of:
https://code.launchpad.net/~ddstreet/ubuntu/+source/systemd/+git/systemd/+merge/374303
-- 
https://code.launchpad.net/~ddstreet/ubuntu/+source/systemd/+git/systemd/+merge/370152
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-eoan.