[Merge] ~rbalint/ubuntu-seeds/+git/platform:disco into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:disco

[Colin Watson]

Review: Approve

This addresses my comments, but please get somebody to review the seed contents themselves.
-- 
https://code.launchpad.net/~rbalint/ubuntu-seeds/+git/platform/+merge/364003
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu-seeds/+git/platform:disco.