Merge proposals dependent on lp://qastaging/~mwhudson/livecd-rootfs/short-circuit-systemd-networkd-wait-online-bionic

1. short-circuit-systemd-networkd-wait-online-bionic
2. Dependent merge proposals