Merge proposals dependent on lp://qastaging/~ken-vandine/ubuntu-release-upgrader/core18_snaps

1. core18_snaps
2. Dependent merge proposals