Correct merge/rebase. Fix handling of console to hvc0. Try and pre-seed cloud-init.