[Merge] ~enr0n/ubuntu-release-upgrader:lp-2060578 into ubuntu-release-upgrader:ubuntu/main

[Nick Rosbrook]

Julian and I talked some more offline. My latest push reflects the changes we discussed.
-- 
https://code.launchpad.net/~enr0n/ubuntu-release-upgrader/+git/ubuntu-release-upgrader/+merge/463945
Your team Ubuntu Core Development Team is subscribed to branch ubuntu-release-upgrader:ubuntu/main.