diff -Nru ubuntu-release-upgrader-17.04.7/data/demoted.cfg ubuntu-release-upgrader-17.04.8/data/demoted.cfg
--- ubuntu-release-upgrader-17.04.7/data/demoted.cfg	2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/data/demoted.cfg	2017-05-19 17:31:43.000000000 +0000
@@ -190,7 +190,6 @@
 ubuntu-wallpapers-yakkety
 ubuntuone-client-data
 ubuntuone-credentials-common
-unity-scope-click
 xserver-xorg-input-evdev
 xserver-xorg-input-evdev-dbg
 xserver-xorg-input-evdev-dev
diff -Nru ubuntu-release-upgrader-17.04.7/data/demoted.cfg.xenial ubuntu-release-upgrader-17.04.8/data/demoted.cfg.xenial
--- ubuntu-release-upgrader-17.04.7/data/demoted.cfg.xenial	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/data/demoted.cfg.xenial	2017-05-19 17:31:43.000000000 +0000
@@ -0,0 +1,253 @@
+# demoted packages from xenial to zesty
+antlr
+antlr-doc
+ceph-fuse
+cgmanager
+checkbox-gui
+cloop-utils
+corosync-notifyd
+cpp-5-aarch64-linux-gnu
+cpp-5-arm-linux-gnueabihf
+cpp-5-powerpc-linux-gnu
+cpp-5-powerpc64le-linux-gnu
+dh-php
+emacs24
+emacs24-bin-common
+emacs24-common
+emacs24-common-non-dfsg
+emacs24-dbg
+emacs24-el
+emacs24-lucid-dbg
+emacs24-nox
+emacs24-nox-dbg
+espeak
+espeak-data
+euca2ools
+fastjar
+fonts-stix
+g++-5
+g++-5-aarch64-linux-gnu
+g++-5-arm-linux-gnueabihf
+g++-5-multilib
+g++-5-powerpc-linux-gnu
+g++-5-powerpc64le-linux-gnu
+gcc-5-aarch64-linux-gnu
+gcc-5-aarch64-linux-gnu-base
+gcc-5-arm-linux-gnueabihf
+gcc-5-arm-linux-gnueabihf-base
+gcc-5-cross-base
+gcc-5-multilib
+gcc-5-powerpc-linux-gnu
+gcc-5-powerpc-linux-gnu-base
+gcc-5-powerpc64le-linux-gnu
+gcc-5-powerpc64le-linux-gnu-base
+gccgo
+gcj-5
+gcj-5-jdk
+gcj-5-jre
+gcj-5-jre-headless
+gconf-service
+gconf-service-backend
+gconf2
+gconf2-common
+gdebi-core
+gfortran-5
+gfortran-5-multilib
+gir1.2-gconf-2.0
+gir1.2-isocodes-1.2
+gnome-user-guide
+golang-1.6-race-detector-runtime
+golang-github-mvo5-goconfigparser-dev
+golang-github-mvo5-uboot-go-dev
+golang-github-peterh-liner-dev
+golang-go-dbus-dev
+golang-go-flags-dev
+golang-juju-loggo-dev
+golang-pb-dev
+golang-pty-dev
+imagemagick-doc
+installation-guide-powerpc
+lib32readline6
+lib64readline6
+libantlr-dev
+libantlr-java
+libasan2-arm64-cross
+libasan2-armhf-cross
+libasan2-powerpc-cross
+libasan2-ppc64el-cross
+libbonobo2-0
+libbonobo2-common
+libbonobo2-dev
+libbonoboui2-0
+libbonoboui2-common
+libbonoboui2-dev
+libcanberra-gstreamer
+libcephfs-jni
+libcuda1-304-updates
+libcuda1-361
+libespeak-dev
+libespeak1
+libgcc-5-dev-arm64-cross
+libgcc-5-dev-armhf-cross
+libgcc-5-dev-powerpc-cross
+libgcc-5-dev-ppc64el-cross
+libgconf-2-4
+libgconf2-dev
+libgconf2-doc
+libglew-dbg
+libglew-dev
+libgnome-2-0
+libgnome2-0
+libgnome2-bin
+libgnome2-common
+libgnome2-dbg
+libgnome2-dev
+libgnome2-doc
+libgnomecanvas2-0
+libgnomecanvas2-common
+libgnomecanvas2-dev
+libgnomecanvas2-doc
+libgnomeui-0
+libgnomeui-0-dbg
+libgnomeui-common
+libgnomeui-dev
+libgnomeui-doc
+libgnomevfs2-0
+libgnomevfs2-0-dbg
+libgnomevfs2-common
+libgnomevfs2-dev
+libgnomevfs2-extra
+libgo7
+libgo9
+libidl-2-0
+libidl-dev
+libisocodes-dev
+libisocodes1
+libixion-dev
+libjaxp1.3-java
+libjaxp1.3-java-gcj
+libjs-jquery-easing
+libjs-jquery-fancybox
+libjs-jquery-mousewheel
+libjs-jquery-resize-doc
+liblinear-tools
+liblldb-3.8
+liblldb-3.8-dbg
+liblldb-3.8-dev
+libllvm3.8
+libllvm3.8-dbg
+liblpsolve55-dev
+liblua5.1-0
+liblua5.1-0-dbg
+liblua5.1-0-dev
+libmdb2
+libmdbsql2
+libmdds-dev
+libmedia-hub-client5
+libmedia-hub-common5
+libmedia-hub-dev
+libmedia-hub-doc
+liborbit-2-0
+liborbit2
+liborbit2-dev
+liborcus-dev
+libpangox-1.0-0
+libpangox-1.0-dev
+libportaudio2
+libportaudiocpp0
+libreadline6
+libreadline6-dbg
+libsasl2-modules-gssapi-heimdal
+libslp-dev
+libslp1
+libstdc++-5-dev-arm64-cross
+libstdc++-5-dev-armhf-cross
+libstdc++-5-dev-powerpc-cross
+libstdc++-5-dev-ppc64el-cross
+libsuitesparse-dev
+libsuitesparse-doc
+libtspi-dev
+libtspi1
+libwebkit2gtk-4.0-37-gtk2
+libx32readline6
+libxalan2-java
+libxalan2-java-doc
+libxerces2-java
+libxerces2-java-doc
+libxerces2-java-gcj
+libxml-commons-external-java
+libxml-commons-external-java-doc
+libxml-commons-resolver1.1-java
+libxml-commons-resolver1.1-java-doc
+libxml-commons-resolver1.1-java-gcj
+lldb-3.8
+llvm-3.8
+llvm-3.8-dev
+llvm-3.8-doc
+llvm-3.8-examples
+llvm-3.8-runtime
+lp-solve
+lp-solve-doc
+lua-lpeg
+lua-lpeg-dev
+lua5.1-doc
+lzma
+lzma-dev
+makedev
+mdbtools
+mdbtools-dbg
+mdbtools-dev
+mdbtools-doc
+mdbtools-gmdb
+mountall
+neutron-lbaas-common
+ntpdate
+nvidia-opencl-icd-304-updates
+nvidia-opencl-icd-361
+odbc-mdbtools
+openslp-doc
+orbit2
+portaudio19-dev
+portaudio19-doc
+python-billiard-doc
+python-boto
+python-ecdsa
+python-kajiki-doc
+python-lldb-3.8
+python-neutron-lbaas
+python-nose-doc
+python-requestbuilder
+python3-alembic
+python3-billiard
+python3-changelog
+python3-dogpile.core
+python3-ecdsa
+python3-kajiki
+python3-memcache
+python3-nose
+python3-redis
+python3-rednose
+python3-sphinx-paramlinks
+python3-sphinx-rtd-theme
+python3-sure
+python3-tdb
+python3-termstyle
+python3-tornado
+qemu-system-mips
+qemu-system-misc
+qemu-system-sparc
+qtdeclarative5-test-plugin
+rbd-fuse
+rbd-mirror
+rbd-nbd
+signon-plugin-password
+transmission-cli
+transmission-daemon
+transmission-qt
+trousers
+trousers-dbg
+ubuntu-wallpapers-xenial
+xserver-xorg-input-evdev
+xserver-xorg-input-evdev-dbg
+xserver-xorg-input-evdev-dev
+xul-ext-mozvoikko
diff -Nru ubuntu-release-upgrader-17.04.7/data/DistUpgrade.cfg.xenial ubuntu-release-upgrader-17.04.8/data/DistUpgrade.cfg.xenial
--- ubuntu-release-upgrader-17.04.7/data/DistUpgrade.cfg.xenial	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/data/DistUpgrade.cfg.xenial	2017-05-19 17:31:13.000000000 +0000
@@ -0,0 +1,150 @@
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= apt (>= 1.0.10.2ubuntu2)
+# the views below support upgrades over ssh connection
+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
+
+# Distro contains global information about the upgrade
+[Distro]
+# the meta-pkgs we support
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-core,
+   xubuntu-desktop, ubuntustudio-desktop, mythbuntu-desktop,
+   kubuntu-netbook, lubuntu-core, lubuntu-desktop, ubuntu-gnome-desktop,
+   ubuntu-mate-core, ubuntu-mate-cloudtop, ubuntu-mate-desktop,
+   ubuntukylin-desktop
+BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
+Demotions=demoted.cfg
+#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
+RemovalBlacklistFile=removal_blacklist.cfg
+# if those packages were installed, make sure to keep them installed
+KeepInstalledPkgs=xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
+# hints for for stuff that should be done right after the cache calculated
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradeInstall=apt
+PostInstallScripts=./xorg_fix_proprietary.py
+EnableApport=yes
+# this supported blacklisting certain versions to ensure we do not upgrade
+#  - blcr-dkms fails to build on kernel 2.6.35
+#BadVersions=blcr-dkms_0.8.2-13
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+[KernelRemoval]
+Version=4.2.0
+BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
+  linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools,
+  linux-image-extra
+Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp,
+  powerpc64-emb,powerpc64-smp,rt,server,virtual
+
+# information about the individual meta-pkgs
+[ubuntu-desktop]
+KeyDependencies=lightdm, unity, ubuntu-artwork, ubuntu-sounds
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+ForcedObsoletes=desktop-effects, gnome-app-install, policykit-gnome, gnome-mount
+
+[kubuntu-desktop]
+KeyDependencies=plasma-desktop, kubuntu-settings-desktop
+PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
+# those packages are marked as obsolete right after the upgrade
+ForcedObsoletes=ivman, gtk-qt-engine
+# help the resolver a bit: LP: #1426132
+PostUpgradeInstall=baloo-kf5
+
+[kubuntu-netbook]
+KeyDependencies=plasma-netbook, kubuntu-settings-netbook
+
+[ubuntu-netbook]
+KeyDependencies=gdm, ubuntu-netbook-default-settings
+
+[xubuntu-core]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[xubuntu-desktop]
+KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4
+PostUpgradeRemove=notification-daemon
+
+[ubuntustudio-desktop]
+KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look
+
+[ichthux-desktop]
+KeyDependencies=ichthux-artwork, ichthux-default-settings
+
+[mythbuntu-desktop]
+KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
+
+[lubuntu-core]
+KeyDependencies=lubuntu-artwork, lubuntu-default-settings, openbox
+
+[lubuntu-desktop]
+KeyDependencies=lubuntu-core, lubuntu-default-settings
+
+[ubuntu-gnome-desktop]
+KeyDependencies=ubuntu-gnome-default-settings, ubuntu-gnome-wallpapers
+
+[ubuntu-mate-core]
+KeyDependencies=folder-color-caja, ubuntu-mate-artwork, ubuntu-mate-default-settings, ubuntu-mate-welcome
+PostUpgradeRemove=ibus
+
+[ubuntu-mate-cloudtop]
+KeyDependencies=ubuntu-mate-core
+PostUpgradeRemove=ibus
+
+[ubuntu-mate-desktop]
+KeyDependencies=deja-dup-caja, ubuntu-mate-core, ubuntu-mate-lightdm-theme
+PostUpgradeRemove=ibus
+
+[ubuntukylin-desktop]
+KeyDependencies=ubuntukylin-keyring, ubuntukylin-wallpapers, ubuntu-kylin-docs
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=xenial
+To=zesty
+ValidOrigin=Ubuntu
+ValidMirrors = mirrors.cfg
+Components=main,restricted,universe,multiverse
+Pockets=security,updates,proposed,backports
+;AllowThirdParty=False
+
+;[PreRequists]
+;Packages=release-upgrader-apt,release-upgrader-dpkg
+;SourcesList=prerequists-sources.list
+;SourcesList-ia64=prerequists-sources.ports.list
+;SourcesList-hppa=prerequists-sources.ports.list
+
+[Aufs]
+; this is a xor option, either full or chroot overlay
+;EnableFullOverlay=yes
+;EnableChrootOverlay=yes
+; sync changes from the chroot back to the real system
+;EnableChrootRsync=yes
+; what chroot dir to use
+;ChrootDir=/tmp/upgrade-chroot
+; the RW dir to use (either for full overlay or chroot overlay)
+;RWDir=/tmp/upgrade-rw
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400
diff -Nru ubuntu-release-upgrader-17.04.7/data/mirrors.cfg ubuntu-release-upgrader-17.04.8/data/mirrors.cfg
--- ubuntu-release-upgrader-17.04.7/data/mirrors.cfg	2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/data/mirrors.cfg	2017-05-19 17:31:43.000000000 +0000
@@ -124,7 +124,6 @@
 http://mirror.csclub.uwaterloo.ca/ubuntu/
 http://nz.archive.ubuntu.com/ubuntu/
 http://nl3.archive.ubuntu.com/ubuntu/
-http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/
 http://ubuntutym.u-toyama.ac.jp/ubuntu/
 http://ubuntu.mirror.cambrium.nl/ubuntu/
 http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/
@@ -186,12 +185,10 @@
 http://mirror.bytemark.co.uk/ubuntu/
 http://mirror.corbina.net/ubuntu/
 http://mirror.cse.iitk.ac.in/ubuntu/
-http://mirror.kavalinux.com/ubuntu/
 http://mirror.kku.ac.th/ubuntu/
 http://mirror.metrocast.net/ubuntu/
 http://mirror.sov.uk.goscomb.net/ubuntu/
 http://mirror.steadfast.net/ubuntu/
-http://mirror.symnds.com/ubuntu/
 http://mirror.telepoint.bg/ubuntu/
 http://mirror.timeweb.ru/ubuntu/
 http://mirror.umd.edu/ubuntu/
@@ -237,7 +234,6 @@
 http://ubuntu.mirrors.skynet.be/ubuntu/
 http://ubuntu.securedservers.com/
 http://us.archive.ubuntu.com/ubuntu/
-http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/
 http://kartolo.sby.datautama.net.id/ubuntu/
 http://mirror.greennet.gl/ubuntu/
 http://mirror.pregi.net/ubuntu/
@@ -267,7 +263,6 @@
 http://mirror.cogentco.com/pub/linux/ubuntu/
 http://mirror.easyspeedy.com/ubuntu/
 http://mirror.jmu.edu/pub/ubuntu/
-http://mirror.nexcess.net/ubuntu/
 http://mirror.overthewire.com.au/ubuntu/
 http://mirror.unej.ac.id/ubuntu/
 http://mirrors.arpnetworks.com/Ubuntu/
@@ -275,7 +270,6 @@
 http://mirrors.yun-idc.com/ubuntu/
 http://ubuntu-archive.mirror.nucleus.be/
 http://ubuntu-archive.mirror.serveriai.lt/
-http://ubuntu.bhs.mirrors.ovh.net/ftp.ubuntu.com/ubuntu/
 http://ubuntu.ip-connect.vn.ua/
 http://mirror.dhakacom.com/ubuntu/
 http://mirror.logol.ru/ubuntu/
@@ -301,13 +295,10 @@
 http://mirror.atlantic.net/ubuntu/
 http://mirror.uchile.cl/ubuntu/
 http://mirrors.aliyun.com/ubuntu/
-http://ubuntu.mirrors.ovh.net/ftp.ubuntu.com/ubuntu/
 http://archive.ubuntu.mirror.rafal.ca/ubuntu/
 http://ftp.agh.edu.pl/ubuntu/
 http://ftp.yzu.edu.tw/ubuntu/
 http://kebo.pens.ac.id/ubuntu/
-http://mirror.as24220.net/pub/ubuntu-archive/
-http://mirror.as24220.net/pub/ubuntu/
 http://mirror.cc.vt.edu/pub2/ubuntu/
 http://mirror.cs.pitt.edu/ubuntu/archive/
 http://mirror.dhakacom.com/ubuntu-archive/
@@ -340,7 +331,6 @@
 http://mirror.rise.ph/ubuntu/
 http://mirror01.idc.hinet.net/ubuntu/
 http://mirrors.asnet.am/ubuntu/
-http://mirrors.cqu.edu.cn/ubuntu/
 http://mirrors.nayatel.com/ubuntu/
 http://ubuntu.ipserverone.com/ubuntu/
 http://ubuntu.mirrors.wvstateu.edu/
@@ -370,7 +360,6 @@
 http://ftp.ntua.gr/ubuntu/
 http://mirror.stw-aachen.de/ubuntu/
 http://mirrors.tuna.tsinghua.edu.cn/ubuntu/
-http://jaran.undip.ac.id/ubuntu/
 http://ftp.ntou.edu.tw/ubuntu/
 http://mirrors.noction.com/ubuntu/archive/
 http://mirror.adminbannok.com/ubuntu/
@@ -395,7 +384,6 @@
 http://ubuntu.dcc.fc.up.pt/
 http://mirror.earthlink.iq/ubuntu/
 http://ftp.utexas.edu/ubuntu/
-http://mirrors.cug.edu.cn/ubuntu/
 http://giano.com.dist.unige.it/ubuntu/
 http://mirror.math.princeton.edu/pub/ubuntu/
 http://mirror.datacenter.az/ubuntu/
@@ -432,7 +420,6 @@
 http://mirror.its.sfu.ca/mirror/ubuntu/
 http://repos.forethought.net/ubuntu/
 http://repo.unpatti.ac.id/ubuntu/
-http://mirror.intergrid.com.au/ubuntu/
 http://mirror.ufscar.br/ubuntu/
 http://mirrors.dk.telia.net/ubuntu/
 http://ubuntu.dts.mg/ubuntu/
@@ -447,7 +434,6 @@
 http://ubuntu.mirror.neology.co.za/ubuntu/
 http://mirror.cedille.club/ubuntu/
 http://mirror.digistar.vn/ubuntu/
-http://mirror.daniel-jost.net/ubuntu/
 http://es-mirrors.evowise.com/ubuntu/
 http://mirror.dataone.nl/ubuntu-archive/
 http://muug.ca/mirror/ubuntu/
@@ -468,11 +454,9 @@
 http://mirrors.opencas.org/ubuntu/
 http://mirrors.bangmod.cloud/ubuntu/
 http://mirror.upb.edu.co/ubuntu/
-http://mirror.imbrandon.com/ubuntu/
 http://buaya.klas.or.id/ubuntu/
 http://mirror.squ.edu.om/ubuntuarchive/
 http://mirror-jnb.psychz.net/Ubuntu/
-http://jvwjgames.net/ubuntu-updates/
 http://mirror.nodesdirect.com/ubuntu/
 http://mirrors.pol.hostinja.com/ubuntu/
 http://mirror.inludian.com/ubuntu/
@@ -487,7 +471,6 @@
 http://mirror.truenetwork.ru/ubuntu/
 http://mirror.ratiokontakt.de/mirror/ubuntu/
 http://ubuntu.archive.kw.zain.com/
-http://ubuntu.laps.ufpa.br/ubuntu/
 http://ubuntu.digitalsuisse.com/
 http://mirror.uni-trier.de/ubuntu/
 http://mirror.ng/ubuntu-archive/
@@ -497,3 +480,19 @@
 http://ubuntu-archive.adsolux.com/ubuntu/
 http://ubuntu.mirror.solnode.io/ubuntu/
 http://mirrors.vhost.vn/ubuntu/
+http://ubuntu.mirrors.ovh.net/ubuntu/
+http://mirror.softcontrol.net/ubuntu/
+http://ubuntu.bhs.mirrors.ovh.net/ubuntu/
+http://mirrors.njupt.edu.cn/ubuntu/
+http://glua.ua.pt/pub/ubuntu/
+http://mirror.us-midwest-1.nexcess.net/ubuntu/
+http://mirrors.sohu.com/ubuntu/
+http://mirror.sjc02.svwh.net/ubuntu/
+http://mirrordenver.fdcservers.net/ubuntu/
+http://mirrors.ulbsibiu.ro/ubuntu/
+http://archive.ubuntu.uasw.edu/
+http://fastmirror.ir/ubuntu/
+http://mirror.datacenter.mn/ubuntu/
+http://mirror.veracruz.co/ubuntu/
+http://ubuntu.sepidvas.com/ubuntu/
+http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
diff -Nru ubuntu-release-upgrader-17.04.7/debian/changelog ubuntu-release-upgrader-17.04.8/debian/changelog
--- ubuntu-release-upgrader-17.04.7/debian/changelog	2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/debian/changelog	2017-05-19 17:31:43.000000000 +0000
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:17.04.8) zesty; urgency=medium
+
+  * Create demoted.cfg.xenial and DistUpgrade.cfg.xenial so that upgrades from
+    Ubuntu 16.04 to Ubuntu 17.04 are supported. (LP: #1692092)
+
+ -- Brian Murray <brian@ubuntu.com>  Fri, 19 May 2017 10:31:43 -0700
+
 ubuntu-release-upgrader (1:17.04.7) zesty; urgency=medium
 
   * No change rebuild to update promotions, demotions, and mirror lists.
diff -Nru ubuntu-release-upgrader-17.04.7/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-17.04.8/DistUpgrade/DistUpgradeVersion.py
--- ubuntu-release-upgrader-17.04.7/DistUpgrade/DistUpgradeVersion.py	2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/DistUpgrade/DistUpgradeVersion.py	2017-05-19 17:31:43.000000000 +0000
@@ -1 +1 @@
-VERSION = '17.04.7'
+VERSION = '17.04.8'
diff -Nru ubuntu-release-upgrader-17.04.7/pre-build.sh ubuntu-release-upgrader-17.04.8/pre-build.sh
--- ubuntu-release-upgrader-17.04.7/pre-build.sh	2017-04-11 15:55:03.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/pre-build.sh	2017-05-19 17:30:18.000000000 +0000
@@ -13,7 +13,7 @@
 (cd utils && ./demotions.py yakkety zesty > demoted.cfg)
 # when this gets enabled, make sure to add symlink in DistUpgrade
 # echo "Running lts demotions"
-#(cd utils && ./demotions.py trusty xenial > demoted.cfg.trusty)
+(cd utils && ./demotions.py xenial zesty > demoted.cfg.xenial)
 
 # update apt_btrfs_snapshot.py copy, this needs an installed
 # apt-btrfs-snapshot on the build machine
diff -Nru ubuntu-release-upgrader-17.04.7/utils/demoted.cfg ubuntu-release-upgrader-17.04.8/utils/demoted.cfg
--- ubuntu-release-upgrader-17.04.7/utils/demoted.cfg	2017-04-11 15:57:42.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/utils/demoted.cfg	2017-05-19 17:31:43.000000000 +0000
@@ -190,7 +190,6 @@
 ubuntu-wallpapers-yakkety
 ubuntuone-client-data
 ubuntuone-credentials-common
-unity-scope-click
 xserver-xorg-input-evdev
 xserver-xorg-input-evdev-dbg
 xserver-xorg-input-evdev-dev
diff -Nru ubuntu-release-upgrader-17.04.7/utils/demoted.cfg.xenial ubuntu-release-upgrader-17.04.8/utils/demoted.cfg.xenial
--- ubuntu-release-upgrader-17.04.7/utils/demoted.cfg.xenial	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-release-upgrader-17.04.8/utils/demoted.cfg.xenial	2017-05-19 17:31:43.000000000 +0000
@@ -0,0 +1,253 @@
+# demoted packages from xenial to zesty
+antlr
+antlr-doc
+ceph-fuse
+cgmanager
+checkbox-gui
+cloop-utils
+corosync-notifyd
+cpp-5-aarch64-linux-gnu
+cpp-5-arm-linux-gnueabihf
+cpp-5-powerpc-linux-gnu
+cpp-5-powerpc64le-linux-gnu
+dh-php
+emacs24
+emacs24-bin-common
+emacs24-common
+emacs24-common-non-dfsg
+emacs24-dbg
+emacs24-el
+emacs24-lucid-dbg
+emacs24-nox
+emacs24-nox-dbg
+espeak
+espeak-data
+euca2ools
+fastjar
+fonts-stix
+g++-5
+g++-5-aarch64-linux-gnu
+g++-5-arm-linux-gnueabihf
+g++-5-multilib
+g++-5-powerpc-linux-gnu
+g++-5-powerpc64le-linux-gnu
+gcc-5-aarch64-linux-gnu
+gcc-5-aarch64-linux-gnu-base
+gcc-5-arm-linux-gnueabihf
+gcc-5-arm-linux-gnueabihf-base
+gcc-5-cross-base
+gcc-5-multilib
+gcc-5-powerpc-linux-gnu
+gcc-5-powerpc-linux-gnu-base
+gcc-5-powerpc64le-linux-gnu
+gcc-5-powerpc64le-linux-gnu-base
+gccgo
+gcj-5
+gcj-5-jdk
+gcj-5-jre
+gcj-5-jre-headless
+gconf-service
+gconf-service-backend
+gconf2
+gconf2-common
+gdebi-core
+gfortran-5
+gfortran-5-multilib
+gir1.2-gconf-2.0
+gir1.2-isocodes-1.2
+gnome-user-guide
+golang-1.6-race-detector-runtime
+golang-github-mvo5-goconfigparser-dev
+golang-github-mvo5-uboot-go-dev
+golang-github-peterh-liner-dev
+golang-go-dbus-dev
+golang-go-flags-dev
+golang-juju-loggo-dev
+golang-pb-dev
+golang-pty-dev
+imagemagick-doc
+installation-guide-powerpc
+lib32readline6
+lib64readline6
+libantlr-dev
+libantlr-java
+libasan2-arm64-cross
+libasan2-armhf-cross
+libasan2-powerpc-cross
+libasan2-ppc64el-cross
+libbonobo2-0
+libbonobo2-common
+libbonobo2-dev
+libbonoboui2-0
+libbonoboui2-common
+libbonoboui2-dev
+libcanberra-gstreamer
+libcephfs-jni
+libcuda1-304-updates
+libcuda1-361
+libespeak-dev
+libespeak1
+libgcc-5-dev-arm64-cross
+libgcc-5-dev-armhf-cross
+libgcc-5-dev-powerpc-cross
+libgcc-5-dev-ppc64el-cross
+libgconf-2-4
+libgconf2-dev
+libgconf2-doc
+libglew-dbg
+libglew-dev
+libgnome-2-0
+libgnome2-0
+libgnome2-bin
+libgnome2-common
+libgnome2-dbg
+libgnome2-dev
+libgnome2-doc
+libgnomecanvas2-0
+libgnomecanvas2-common
+libgnomecanvas2-dev
+libgnomecanvas2-doc
+libgnomeui-0
+libgnomeui-0-dbg
+libgnomeui-common
+libgnomeui-dev
+libgnomeui-doc
+libgnomevfs2-0
+libgnomevfs2-0-dbg
+libgnomevfs2-common
+libgnomevfs2-dev
+libgnomevfs2-extra
+libgo7
+libgo9
+libidl-2-0
+libidl-dev
+libisocodes-dev
+libisocodes1
+libixion-dev
+libjaxp1.3-java
+libjaxp1.3-java-gcj
+libjs-jquery-easing
+libjs-jquery-fancybox
+libjs-jquery-mousewheel
+libjs-jquery-resize-doc
+liblinear-tools
+liblldb-3.8
+liblldb-3.8-dbg
+liblldb-3.8-dev
+libllvm3.8
+libllvm3.8-dbg
+liblpsolve55-dev
+liblua5.1-0
+liblua5.1-0-dbg
+liblua5.1-0-dev
+libmdb2
+libmdbsql2
+libmdds-dev
+libmedia-hub-client5
+libmedia-hub-common5
+libmedia-hub-dev
+libmedia-hub-doc
+liborbit-2-0
+liborbit2
+liborbit2-dev
+liborcus-dev
+libpangox-1.0-0
+libpangox-1.0-dev
+libportaudio2
+libportaudiocpp0
+libreadline6
+libreadline6-dbg
+libsasl2-modules-gssapi-heimdal
+libslp-dev
+libslp1
+libstdc++-5-dev-arm64-cross
+libstdc++-5-dev-armhf-cross
+libstdc++-5-dev-powerpc-cross
+libstdc++-5-dev-ppc64el-cross
+libsuitesparse-dev
+libsuitesparse-doc
+libtspi-dev
+libtspi1
+libwebkit2gtk-4.0-37-gtk2
+libx32readline6
+libxalan2-java
+libxalan2-java-doc
+libxerces2-java
+libxerces2-java-doc
+libxerces2-java-gcj
+libxml-commons-external-java
+libxml-commons-external-java-doc
+libxml-commons-resolver1.1-java
+libxml-commons-resolver1.1-java-doc
+libxml-commons-resolver1.1-java-gcj
+lldb-3.8
+llvm-3.8
+llvm-3.8-dev
+llvm-3.8-doc
+llvm-3.8-examples
+llvm-3.8-runtime
+lp-solve
+lp-solve-doc
+lua-lpeg
+lua-lpeg-dev
+lua5.1-doc
+lzma
+lzma-dev
+makedev
+mdbtools
+mdbtools-dbg
+mdbtools-dev
+mdbtools-doc
+mdbtools-gmdb
+mountall
+neutron-lbaas-common
+ntpdate
+nvidia-opencl-icd-304-updates
+nvidia-opencl-icd-361
+odbc-mdbtools
+openslp-doc
+orbit2
+portaudio19-dev
+portaudio19-doc
+python-billiard-doc
+python-boto
+python-ecdsa
+python-kajiki-doc
+python-lldb-3.8
+python-neutron-lbaas
+python-nose-doc
+python-requestbuilder
+python3-alembic
+python3-billiard
+python3-changelog
+python3-dogpile.core
+python3-ecdsa
+python3-kajiki
+python3-memcache
+python3-nose
+python3-redis
+python3-rednose
+python3-sphinx-paramlinks
+python3-sphinx-rtd-theme
+python3-sure
+python3-tdb
+python3-termstyle
+python3-tornado
+qemu-system-mips
+qemu-system-misc
+qemu-system-sparc
+qtdeclarative5-test-plugin
+rbd-fuse
+rbd-mirror
+rbd-nbd
+signon-plugin-password
+transmission-cli
+transmission-daemon
+transmission-qt
+trousers
+trousers-dbg
+ubuntu-wallpapers-xenial
+xserver-xorg-input-evdev
+xserver-xorg-input-evdev-dbg
+xserver-xorg-input-evdev-dev
+xul-ext-mozvoikko