[Merge] ~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu:canary-merge into ~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu:lunar

[Dan Bungert]

Review: Approve

Looks correct.

This does result in the add-back of some linux-modules-nvidia and some oem packages, but I suspect that's the correct action.
-- 
https://code.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu/+merge/434191
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu:lunar.