Merge proposals dependent on lp://staging/~cjwatson/console-setup/udev

lp://staging/~cjwatson/console-setup/udev has no merge proposals.