$ sh -c 'git diff ubuntu/devel | filterdiff --exclude "debian/changelog"'
diff --git a/debian/apport-launcher.py b/debian/apport-launcher.py
deleted file mode 100644
index 30fea31b..00000000
+++ /dev/null
@@ -1,6 +0,0 @@
-'''Wrapper for cloudinit apport interface'''
-
-from cloudinit.apport import add_info as cloudinit_add_info
-
-def add_info(report, ui):
-    return cloudinit_add_info(report, ui)
diff --git a/debian/changelog b/debian/changelog
index 5e4d7301..f0ff2212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,23 @@
-cloud-init (17.1-17-g45d361cb-0ubuntu1) artful; urgency=medium
+cloud-init (17.1-17-g45d361cb-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
-  * New upstream snapshot.
+  * drop the following cherry picks, now incorporated in snapshot.
+    + debian/patches/cpick-a2f8ce9c-Do-not-provide-systemd-fsck-drop...
+  * debian/copyright: dep5 updates, reorganize, add Apache 2.0 license.
+    (LP: #1718681)
+  * debian/control: drop dependency on python3-prettytable
+  * New upstream snapshot. (LP: #1721847)
     - net: Handle bridge stp values of 0 and convert to boolean type
       [Chad Smith]
     - tools: Give specific --abbrev=8 to "git describe"
-    - network: bridge_stp value not always correct [Ryan Harper] (LP: #1721157)
+    - network: bridge_stp value not always correct [Ryan Harper]
     - tests: re-enable tox with nocloud-kvm support [Joshua Powers]
-
- -- Ryan Harper <ryan.harper@canonical.com>  Thu, 05 Oct 2017 16:15:34 -0500
-
-cloud-init (17.1-13-g7fd04255-0ubuntu1) artful; urgency=medium
-
-  * debian/copyright: dep5 updates, reorganize, add Apache 2.0 license.
-    (LP: #1718681)
-  * debian/control: drop dependency on python3-prettytable
-  * New upstream snapshot.
     - systemd: remove limit on tasks created by cloud-init-final.service.
-      [Robert Schweikert] (LP: #1717969)
+      [Robert Schweikert]
     - suse: Support addition of zypper repos via cloud-config.
-      [Robert Schweikert] (LP: #1718675)
+      [Robert Schweikert]
     - tests: Combine integration configs and testcases [Joshua Powers]
     - Azure, CloudStack: Support reading dhcp options from systemd-networkd.
-      [Dimitri John Ledkov] (LP: #1718029)
+      [Dimitri John Ledkov]
     - packages/debian/copyright: remove mention of boto and MIT license
     - systemd: only mention Before=apt-daily.service on debian based distros.
       [Robert Schweikert]
@@ -29,99 +25,55 @@ cloud-init (17.1-13-g7fd04255-0ubuntu1) artful; urgency=medium
       [Chad Smith]
     - Remove prettytable dependency, introduce simpletable [Andrew Jorgensen]
     - debian/copyright: dep5 updates, reorganize, add Apache 2.0 license.
-      [Joshua Powers] (LP: #1718681)
+      [Joshua Powers]
     - tests: remove dependency on shlex [Joshua Powers]
     - AltCloud: Trust PATH for udevadm and modprobe.
     - DataSourceOVF: use util.find_devs_with(TYPE=iso9660)
-      [Ryan Harper] (LP: #1718287)
+      [Ryan Harper]
     - tests: remove a temp file used in bootcmd tests.
-
- -- Ryan Harper <ryan.harper@canonical.com>  Tue, 03 Oct 2017 10:59:52 -0500
-
-cloud-init (17.1-0ubuntu1) artful; urgency=medium
-
-  * New upstream release.
+    - release 17.1
     - doc: document GCE datasource. [Arnd Hannemann]
     - suse: updates to templates to support openSUSE and SLES.
-      [Robert Schweikert] (LP: #1718640)
+      [Robert Schweikert]
     - suse: Copy sysvinit files from redhat with slight changes.
-      [Robert Schweikert] (LP: #1718649)
+      [Robert Schweikert]
     - docs: fix sphinx module schema documentation [Chad Smith]
     - tests: Add cloudinit package to all test targets [Chad Smith]
     - Makefile: No longer look for yaml files in obsolete ./bin/.
     - tests: fix ds-identify unit tests to set EC2_STRICT_ID_DEFAULT.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 22 Sep 2017 12:21:18 -0400
-
-cloud-init (0.7.9-283-g7eb3460b-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
     - ec2: Fix maybe_perform_dhcp_discovery to use /var/tmp as a tmpdir
-      [Chad Smith] (LP: #1717627)
+      [Chad Smith]
     - Azure: wait longer for SSH pub keys to arrive.
-      [Paul Meyer] (LP: #1717611)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 18 Sep 2017 20:41:53 -0400
-
-cloud-init (0.7.9-281-g10f067d8-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
-    - GCE: Fix usage of user-data. (LP: #1717598)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 18 Sep 2017 17:03:22 -0400
-
-cloud-init (0.7.9-280-ge626966e-0ubuntu1) artful; urgency=medium
-
-  * debian/rules: install rsyslog file with 0644 mode instead of 0755.
-  * debian/rules, debian/apport-launcher.py: add an apport hook. (LP: #1607345)
-  * New upstream snapshot.
-    - cmdline: add collect-logs subcommand. [Chad Smith] (LP: #1607345)
+      [Paul Meyer]
+    - GCE: Fix usage of user-data.
+    - cmdline: add collect-logs subcommand. [Chad Smith]
     - CloudStack: consider dhclient lease files named with a hyphen.
-      (LP: #1717147)
     - resizefs: Drop check for read-only device file, do not warn on
       overlayroot. [Chad Smith]
-    - Do not provide systemd-fsck drop-in which could cause ordering cycles.
-      [Balint Reczey] (LP: #1717477)
     - tests: Enable the NoCloud KVM platform [Joshua Powers]
     - resizefs: pass mount point to xfs_growfs [Dusty Mabe]
     - vmware: Enable nics before sending the SUCCESS event. [Sankar Tanguturi]
     - cloud-config modules: honor distros definitions in each module
-      [Chad Smith] (LP: #1715738, #1715690)
+      [Chad Smith]
     - chef: Add option to pin chef omnibus install version
-      [Ethan Apodaca] (LP: #1462693)
+      [Ethan Apodaca]
     - tests: execute: support command as string [Joshua Powers]
     - schema and docs: Add jsonschema to resizefs and bootcmd modules
       [Chad Smith]
     - tools: Add xkvm script, wrapper around qemu-system [Joshua Powers]
     - vmware customization: return network config format
-      [Sankar Tanguturi] (LP: #1675063)
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 15 Sep 2017 16:09:07 -0400
-
-cloud-init (0.7.9-267-g922c3c5c-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
+      [Sankar Tanguturi]
     - Ec2: only attempt to operate at local mode on known platforms.
-      (LP: #1715128)
-    - Use /run/cloud-init for tempfile operations. (LP: #1707222)
+    - Use /run/cloud-init for tempfile operations.
     - ds-identify: Make OpenStack return maybe on arch other than intel.
-      (LP: #1715241)
     - tests: mock missed openstack metadata uri network_data.json
-      [Chad Smith] (LP: #1714376)
+      [Chad Smith]
     - relocate tests/unittests/helpers.py to cloudinit/tests
       [Lars Kellogg-Stedman]
     - tox: add nose timer output [Joshua Powers]
     - upstart: do not package upstart jobs, drop ubuntu-init-switch module.
     - tests: Stop leaking calls through unmocked metadata addresses
-      [Chad Smith] (LP: #1714117)
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 07 Sep 2017 16:59:04 -0400
-
-cloud-init (0.7.9-259-g7e76c57b-0ubuntu1) artful; urgency=medium
-
-  * Disable upstart support, as upstart is no longer shipped in artful.
-    [Dimitri Ledkov]
-  * New upstream snapshot.
+      [Chad Smith]
     - distro: allow distro to specify a default locale [Ryan Harper]
     - tests: fix two recently added tests for sles distro.
     - url_helper: dynamically import oauthlib import from inside oauth_headers
@@ -130,165 +82,126 @@ cloud-init (0.7.9-259-g7e76c57b-0ubuntu1) artful; urgency=medium
     - suse: Add support for openSUSE and return SLES to a working state.
       [Robert Schweikert]
     - GCE: Add a main to the GCE Datasource.
-    - ec2: Add IPv6 dhcp support to Ec2DataSource. [Chad Smith] (LP: #1639030)
+    - ec2: Add IPv6 dhcp support to Ec2DataSource. [Chad Smith]
     - url_helper: fail gracefully if oauthlib is not available
-      [Lars Kellogg-Stedman] (LP: #1713760)
+      [Lars Kellogg-Stedman]
     - cloud-init analyze: fix issues running under python 2. [Andrew Jorgensen]
     - Configure logging module to always use UTC time.
-      [Ryan Harper] (LP: #1713158)
+      [Ryan Harper]
     - Log a helpful message if a user script does not include shebang.
       [Andrew Jorgensen]
     - cli: Fix command line parsing of coniditionally loaded subcommands.
-      [Chad Smith] (LP: #1712676)
+      [Chad Smith]
     - doc: Explain error behavior in user data include file format.
       [Jason Butz]
     - cc_landscape & cc_puppet: Fix six.StringIO use in writing configs
-      [Chad Smith] (LP: #1699282, #1710932)
+      [Chad Smith]
     - schema cli: Add schema subcommand to cloud-init cli and cc_runcmd schema
       [Chad Smith]
     - Debian: Remove non-free repositories from apt sources template.
-      [Joonas Kylmälä] (LP: #1700091)
-
- -- Scott Moser <smoser@ubuntu.com>  Wed, 30 Aug 2017 21:18:05 -0400
-
-cloud-init (0.7.9-243-ge74d775-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
+      [Joonas Kylmälä]
     - tools: Add tooling for basic cloud-init performance analysis.
-      [Chad Smith] (LP: #1709761)
+      [Chad Smith]
     - network: add v2 passthrough and fix parsing v2 config with bonds/bridge
-      params [Ryan Harper] (LP: #1709180)
+      params [Ryan Harper]
     - doc: update capabilities with features available, link doc reference,
       cli example [Ryan Harper]
     - vcloud directory: Guest Customization support for passwords
       [Maitreyee Saikia]
     - ec2: Allow Ec2 to run in init-local using dhclient in a sandbox.
-      [Chad Smith] (LP: #1709772)
+      [Chad Smith]
     - cc_ntp: fallback on timesyncd configuration if ntp is not installable
-      [Ryan Harper] (LP: #1686485)
+      [Ryan Harper]
     - net: Reduce duplicate code. Have get_interfaces_by_mac use
       get_interfaces.
     - tests: Fix build tree integration tests [Joshua Powers]
     - sysconfig: Dont repeat header when rendering resolv.conf
-      [Ryan Harper] (LP: #1701420)
+      [Ryan Harper]
     - archlinux: Fix bug with empty dns, do not render 'lo' devices.
-      (LP: #1663045, #1706593)
-    - cloudinit.net: add initialize_network_device function and tests
-      [Chad Smith]
-    - makefile: fix ci-deps-ubuntu target [Chad Smith]
 
- -- Ryan Harper <ryan.harper@canonical.com>  Mon, 21 Aug 2017 15:09:36 -0500
+ -- Chad Smith <chad.smith@canonical.com>  Fri, 06 Oct 2017 13:56:05 -0600
 
-cloud-init (0.7.9-231-g80bf98b9-0ubuntu1) artful; urgency=medium
+cloud-init (0.7.9-233-ge586fe35-0ubuntu1~16.04.2) xenial-proposed; urgency=medium
 
+  * cherry-pick a2f8ce9c: Do not provide systemd-fsck drop-in which
+    could cause systemd ordering loops (LP: #1717477).
+
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 15 Sep 2017 15:23:38 -0400
+
+cloud-init (0.7.9-233-ge586fe35-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
+
+  * debian/cloud-init.templates: enable Scaleway cloud.
+  * debian/cloud-init.templates: enable Aliyun cloud.
+  * drop the following cherry picks, now incorporated in snapshot.
+    + debian/patches/cpick-5fb49bac-azure-identify-platform...
+    + debian/patches/cpick-003c6678-net-remove-systemd-link...
+    + debian/patches/cpick-1cd4323b-azure-remove-accidental...
+    + debian/patches/cpick-ebc9ecbc-Azure-Add-network-config...
+    + debian/patches/cpick-11121fe4-systemd-make-cloud-final...
+  * debian/patches/stable-release-no-jsonschema-dep.patch:
+    add patch to remove optional dependency on jsonschema.
   * New upstream snapshot.
+    - cloudinit.net: add initialize_network_device function and tests
+      [Chad Smith]
+    - makefile: fix ci-deps-ubuntu target [Chad Smith]
+    - tests: adjust locale integration test to parse default locale.
     - tests: remove 'yakkety' from releases as it is EOL.
+    - centos: do not package systemd-fsck drop-in.
     - systemd: make systemd-fsck run after cloud-init.service (LP: #1691489)
     - tests: Add initial tests for EC2 and improve a docstring.
     - locale: Do not re-run locale-gen if provided locale is system default.
-    - archlinux: fix set hostname usage of write_file.
-      [Joshua Powers] (LP: #1705306)
+    - archlinux: fix set hostname usage of write_file. [Joshua Powers]
     - sysconfig: support subnet type of 'manual'.
+    - tools/run-centos: make running with no argument show help.
     - Drop rand_str() usage in DNS redirection detection
       [Bob Aman] (LP: #1088611)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 31 Jul 2017 09:47:34 -0400
-
-cloud-init (0.7.9-221-g7e41b2a7-0ubuntu3) artful; urgency=medium
-
-  * debian/control: replace Depends on ifupdown with 'nplan | ifupdown'.
-    (LP: #1705639)
-  * debian/control: drop versioned dependencies on old packages.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 21 Jul 2017 12:32:33 -0400
-
-cloud-init (0.7.9-221-g7e41b2a7-0ubuntu2) artful; urgency=medium
-
-  * debian/cloud-init.templates: enable Scaleway cloud.
-  * debian/cloud-init.templates: enable Aliyun cloud.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 21 Jul 2017 09:33:39 -0400
-
-cloud-init (0.7.9-221-g7e41b2a7-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
     - sysconfig: use MACADDR on bonds/bridges to configure mac_address
-      [Ryan Harper] (LP: #1701417)
+      [Ryan Harper]
     - net: eni route rendering missed ipv6 default route config
       [Ryan Harper] (LP: #1701097)
     - sysconfig: enable mtu set per subnet, including ipv6 mtu
-      [Ryan Harper] (LP: #1702513)
-    - sysconfig: handle manual type subnets [Ryan Harper] (LP: #1687725)
-    - sysconfig: fix ipv6 gateway routes [Ryan Harper] (LP: #1694801)
+      [Ryan Harper]
+    - sysconfig: handle manual type subnets [Ryan Harper]
+    - sysconfig: fix ipv6 gateway routes [Ryan Harper]
     - sysconfig: fix rendering of bond, bridge and vlan types.
-      [Ryan Harper] (LP: #1695092)
+      [Ryan Harper]
     - Templatize systemd unit files for cross distro deltas. [Ryan Harper]
-    - sysconfig: ipv6 and default gateway fixes. [Ryan Harper] (LP: #1704872)
-    - net: fix renaming of nics to support mac addresses written in upper case.
-      (LP: #1705147)
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 20 Jul 2017 21:37:12 -0400
-
-cloud-init (0.7.9-212-g865e941f-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
+    - sysconfig: ipv6 and default gateway fixes. [Ryan Harper]
+    - net: fix renaming of nics to support mac addresses written in upper
+      case. (LP: #1705147)
     - tests: fixes for issues uncovered when moving to python 3.6.
-    - sysconfig: include GATEWAY value if set in subnet 
-      [Ryan Harper] (LP: #1686856)
-
- -- Scott Moser <smoser@ubuntu.com>  Wed, 19 Jul 2017 07:54:57 -0400
-
-cloud-init (0.7.9-210-ge80517ae-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
+    - sysconfig: include GATEWAY value if set in subnet
+      [Ryan Harper]
     - Scaleway: add datasource with user and vendor data for Scaleway.
       [Julien Castets]
     - Support comments in content read by load_shell_content.
-    - FreeBSD: cloudinit local fail to run during boot [Hongjiang Zhang]
+    - cloudinitlocal fail to run during boot [Hongjiang Zhang]
     - doc: fix disk setup example table_type options [Sandor Zeestraten]
-      (LP: #1703789)
-    - tools: Fix exception handling. [Joonas Kylmälä] (LP: #1701527)
+    - tools: Fix exception handling. [Joonas Kylmälä]
     - tests: fix usage of mock in GCE test.
     - test_gce: Fix invalid mock of platform_reports_gce to return False
       [Chad Smith]
-    - test: fix incorrect keyid for apt repository. [Joshua Powers]
-      (LP: #1702717)
+    - test: fix incorrect keyid for apt repository.  [Joshua Powers]
     - tests: Update version of pylxd [Joshua Powers]
     - write_files: Remove log from helper function signatures.
       [Andrew Jorgensen]
     - doc: document the cmdline options to NoCloud [Brian Candler]
-
- -- Scott Moser <smoser@ubuntu.com>  Tue, 18 Jul 2017 14:03:33 -0400
-
-cloud-init (0.7.9-199-g4d9f24f5-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
     - read_dmi_data: always return None when inside a container. (LP: #1701325)
     - requirements.txt: remove trailing white space.
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 29 Jun 2017 18:01:21 -0400
-
-cloud-init (0.7.9-197-gebc9ecbc-0ubuntu1) artful; urgency=medium
-
-  * debian/control: add build dependency python3-jsonschema (LP: #1695318)
-  * New upstream snapshot.
-    - Azure: Add network-config, Refactor net layer to handle duplicate macs.
-      [Ryan Harper]
     - Tests: Simplify the check on ssh-import-id [Joshua Powers]
     - tests: update ntp tests after sntp added [Joshua Powers]
     - FreeBSD: Make freebsd a variant, fix unittests and
       tools/build-on-freebsd.
     - FreeBSD: fix test failure
     - FreeBSD: replace ifdown/ifup with "ifconfig down" and "ifconfig up".
-      [Hongjiang Zhang] (LP: #1697815)
+      [Hongjiang Zhang]
     - FreeBSD: fix cdrom mounting failure if /mnt/cdrom/secure did not exist.
-      [Hongjiang Zhang] (LP: #1696295)
+      [Hongjiang Zhang]
     - main: Don't use templater to format the welcome message
       [Andrew Jorgensen]
     - docs: Automatically generate module docs form schema if present.
       [Chad Smith]
-    - debian: fix path comment in /etc/hosts template.
-      [Jens Sandmann] (LP: #1606406)
+    - debian: fix path comment in /etc/hosts template. [Jens Sandmann]
     - suse: add hostname and fully qualified domain to template.
       [Jens Sandmann]
     - write_file(s): Print permissions as octal, not decimal [Andrew Jorgensen]
@@ -297,12 +210,10 @@ cloud-init (0.7.9-197-gebc9ecbc-0ubuntu1) artful; urgency=medium
     - tools/run-centos: cleanups and move to using read-dependencies
     - pkg build ci: Add make ci-deps-<distro> target to install pkgs
       [Chad Smith]
-    - systemd: make cloud-final.service run before apt daily services.
-      (LP: #1693361)
-    - selinux: Allow restorecon to be non-fatal. [Ryan Harper] (LP: #1686751)
-    - net: Allow netinfo subprocesses to return 0 or 1.
-      [Ryan Harper] (LP: #1686751)
-    - net: Allow for NetworkManager configuration [Ryan McCabe] (LP: #1693251)
+    - selinux: Allow restorecon to be non-fatal. [Ryan Harper]
+    - net: Allow netinfo subprocesses to return 0 or 1 due to selinux.
+      [Ryan Harper]
+    - net: Allow for NetworkManager configuration [Ryan McCabe]
     - Use distro release version to determine if we use systemd in redhat spec
       [Ryan Harper]
     - net: normalize data in network_state object
@@ -315,11 +226,10 @@ cloud-init (0.7.9-197-gebc9ecbc-0ubuntu1) artful; urgency=medium
     - cloud.cfg: move to a template.  setup.py changes along the way.
     - Makefile: add deb-src and srpm targets. use PYVER more places.
     - makefile: fix python 2/3 detection in the Makefile [Chad Smith]
-    - snap: Removing snapcraft plug line [Joshua Powers] (LP: #1695333)
+    - snap: Removing snapcraft plug line [Joshua Powers]
     - RHEL/CentOS: Fix default routes for IPv4/IPv6 configuration.
-      [Andreas Karis] (LP: #1696176)
-    - test: Fix pyflakes complaint of unused import.
-      [Joshua Powers] (LP: #1695918)
+      [Andreas Karis]
+    - test: Fix pyflakes complaint of unused import. [Joshua Powers]
     - NoCloud: support seed of nocloud from smbios information
       [Vladimir Pouzanov] (LP: #1691772)
     - net: when selecting a network device, use natural sort order
@@ -327,50 +237,55 @@ cloud-init (0.7.9-197-gebc9ecbc-0ubuntu1) artful; urgency=medium
     - fix typos and remove whitespace in various docs [Stephan Telling]
     - systemd: Fix typo in comment in cloud-init.target. [Chen-Han Hsiao]
     - Tests: Skip jsonschema related unit tests when dependency is absent.
-      [Chad Smith] (LP: #1695318)
-    - azure: remove accidental duplicate line in merge.
-    - azure: identify platform by well known value in chassis asset tag.
-      [Chad Smith] (LP: #1693939)
+      [Chad Smith]
     - tools/net-convert.py: support old cloudinit versions by using kwargs.
     - ntp: Add schema definition and passive schema validation.
       [Chad Smith] (LP: #1692916)
-    - Fix eni rendering for bridge params that require repeated key for values.
-      [Ryan Harper]
-    - net: remove systemd link file writing from eni renderer [Ryan Harper]
+    - Fix eni rendering for bridge params that require repeated key for
+      values. [Ryan Harper] (LP: #1706752)
     - AliYun: Enable platform identification and enable by default.
       [Junjie Wang] (LP: #1638931)
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 27 Jun 2017 17:18:24 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 31 Jul 2017 16:36:16 -0400
+
+cloud-init (0.7.9-153-g16a7302f-0ubuntu1~16.04.2) xenial-proposed; urgency=medium
 
-cloud-init (0.7.9-153-g16a7302f-0ubuntu1) artful; urgency=medium
+  * debian/patches/ds-identify-behavior-xenial.patch: refresh patch.
+  * cherry-pick 5fb49bac: azure: identify platform by well known value
+    in chassis asset (LP: #1693939)
+  * cherry-pick 003c6678: net: remove systemd link file writing from eni
+    renderer
+  * cherry-pick 1cd4323b: azure: remove accidental duplicate line in
+    merge.
+  * cherry-pick ebc9ecbc: Azure: Add network-config, Refactor net layer
+    to handle duplicate macs. (LP: #1690430)
+  * cherry-pick 11121fe4: systemd: make cloud-final.service run before
+    apt daily (LP: #1693361)
+
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 28 Jun 2017 17:17:18 -0400
+
+cloud-init (0.7.9-153-g16a7302f-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * New upstream snapshot.
     - net: fix reading and rendering addresses in cidr format.
       [Dimitri John Ledkov] (LP: #1689346, #1684349)
     - disk_setup: udev settle before attempting partitioning or fs creation.
-      [Scott Moser] (LP: #1692093)
+      (LP: #1692093)
     - GCE: Update the attribute used to find instance SSH keys.
       [Daniel Watkins] (LP: #1693582)
     - nplan: For bonds, allow dashed or underscore names of keys.
       [Dimitri John Ledkov] (LP: #1690480)
-    - python2.6: fix unit tests usage of assertNone and format.
-    - test: update docstring on test_configured_list_with_none
+    - tests: python2.6: fix unit tests usage of assertNone and format.
+    - tests: update docstring on test_configured_list_with_none
     - fix tools/ds-identify to not write None twice.
     - tox/build: do not package depend on style requirements.
-    - cc_ntp: Restructure cc_ntp unit tests. [Chad Smith] (LP: #1692794)
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 26 May 2017 15:11:48 -0400
-
-cloud-init (0.7.9-144-g2825a917-0ubuntu1) artful; urgency=medium
-
-  * New upstream snapshot.
+    - tests: ntp: Restructure cc_ntp unit tests. [Chad Smith]
     - flake8: move the pinned version of flake8 up to 3.3.0
     - tests: Apply workaround for snapd bug in test case. [Joshua Powers]
-    - RHEL/CentOS: Fix dual stack IPv4/IPv6 configuration. [Andreas Karis]
-      (LP: #1679817, #1685534, #1685532)
+    - RHEL/CentOS: Fix dual stack IPv4/IPv6 configuration.  [Andreas Karis]
     - disk_setup: fix several issues with gpt disk partitions. (LP: #1692087)
     - function spelling & docstring update [Joshua Powers]
-    - Fixing wrong file name regression. [Joshua Powers]
+    - tests: Fix unittest bug in ntp tests. [Joshua Powers]
     - tox: move pylint target to 1.7.1
     - Fix get_interfaces_by_mac for empty macs (LP: #1692028)
     - DigitalOcean: remove routes except for the public interface.
@@ -381,20 +296,17 @@ cloud-init (0.7.9-144-g2825a917-0ubuntu1) artful; urgency=medium
       [Felix Dreissig]
     - cc_ntp: write template before installing and add service restart
       [Ryan Harper] (LP: #1645644)
-    - cloudstack: fix tests to avoid accessing /var/lib/NetworkManager
-      [Lars Kellogg-Stedman]
+    - tests: fix cloudstack unit tests to avoid accessing
+      /var/lib/NetworkManager [Lars Kellogg-Stedman]
     - tests: fix hardcoded path to mkfs.ext4 [Joshua Powers] (LP: #1691517)
-    - Actually skip warnings when .skip file is present. [Chris Brinker]
-      (LP: #1691551)
+    - Actually skip warnings when .skip file is present.
+      [Chris Brinker] (LP: #1691551)
     - netplan: fix netplan render_network_state signature.
       [Dimitri John Ledkov] (LP: #1685944)
     - Azure: fix reformatting of ephemeral disks on resize to large types.
       (LP: #1686514)
-    - Revert "tools/net-convert: fix argument order for render_network_state"
-    - make deb: Add devscripts dependency for make deb. Cleanup packages/bddeb.
-      [Chad Smith] (LP: #1685935)
-    - tools/net-convert: fix argument order for render_network_state
-      [Ryan Harper] (LP: #1685944)
+    - make deb: Add devscripts dependency for make deb.
+      Cleanup packages/bddeb. [Chad Smith] (LP: #1685935)
     - openstack: fix log message copy/paste typo in _get_url_settings
       [Lars Kellogg-Stedman]
     - unittests: fix unittests run on centos [Joshua Powers]
@@ -411,22 +323,23 @@ cloud-init (0.7.9-144-g2825a917-0ubuntu1) artful; urgency=medium
       [Paul Meyer] (LP: #1687712)
     - doc: document network configuration defaults policy and formats.
       [Ryan Harper]
-    - Fix name of "uri" key in docs for "cc_apt_configure" module
+    - doc: Fix name of "uri" key in docs for "cc_apt_configure" module
       [Felix Dreissig]
-    - tests: Enable artful [Joshua Powers]
+    - tests: Enable artful in integration tests [Joshua Powers]
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 23 May 2017 17:04:40 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 26 May 2017 15:58:48 -0400
 
-cloud-init (0.7.9-113-g513e99e0-0ubuntu1) artful; urgency=medium
+cloud-init (0.7.9-113-g513e99e0-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
+  * debian/update-grub-legacy-ec2: fix early exit failure no /etc/fstab
+    file. (LP: #1682160)
   * New upstream snapshot.
     - nova-lxd: read product_name from environment, not platform.
       (LP: #1685810)
-    - Fix yum repo config where keys contain array values
-      [Dylan Perry] (LP: #1592150)
-    - template: Update debian backports template [Joshua Powers] (LP: #1627293)
+    - Fix yum repo config where keys contain array values [Dylan Perry]
+    - template: Update debian backports template [Joshua Powers]
     - rsyslog: replace ~ with stop [Joshua Powers] (LP: #1367899)
-    - Doc: add additional RTD examples [Joshua Powers] (LP: #1459604)
+    - Doc: add additional RTD examples [Joshua Powers]
     - Fix growpart for some cases when booted with root=PARTUUID.
       (LP: #1684869)
     - pylint: update output style to parseable [Joshua Powers]
@@ -437,116 +350,77 @@ cloud-init (0.7.9-113-g513e99e0-0ubuntu1) artful; urgency=medium
       [Dimitri John Ledkov] (LP: #1682871)
     - ds-identify: Check correct path for "latest" config drive
       [Daniel Watkins] (LP: #1673637)
-    - doc: Fix example for resolve.conf configuration.
-      [Jon Grimm] (LP: #1531582)
-    - Fix examples that reference upstream chef repository.
-      [Jon Grimm] (LP: #1678145)
+    - doc: Fix example for resolv.conf configuration.  [Jon Grimm]
+    - Fix examples that reference upstream chef repository.  [Jon Grimm]
     - doc: correct grammar and improve clarity in merging documentation.
       [David Tagatac]
     - doc: Add missing doc link to snap-config module. [Ryan Harper]
     - snap: allows for creating cloud-init snap [Joshua Powers]
     - DigitalOcean: assign IPv4ll address to lowest indexed interface.
-      [Ben Howard]
-    - DigitalOcean: configure all NICs presented in meta-data. [Ben Howard]
-    - Remove (and/or fix) URL shortener references [Jon Grimm] (LP: #1669727)
+      [Ben Howard] (LP: #1676908)
+    - DigitalOcean: configure all NICs presented in meta-data.
+      [Ben Howard] (LP: #1676908)
+    - Remove (and/or fix) URL shortener references [Jon Grimm]
     - HACKING.rst: more info on filling out contributors agreement.
-      [Scott Moser]
     - util: teach write_file about copy_mode option
       [Lars Kellogg-Stedman] (LP: #1644064)
-    - DigitalOcean: bind resolvers to loopback interface. [Ben Howard]
+    - DigitalOcean: bind resolvers to loopback interface.
+      [Ben Howard] (LP: #1676908)
     - tests: fix AltCloud tests to not rely on blkid (LP: #1636531)
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 25 Apr 2017 16:34:08 -0400
-
-cloud-init (0.7.9-90-g61eb03fe-0ubuntu2) UNRELEASED; urgency=medium
-
-  * debian/update-grub-legacy-ec2: fix early exit failure no /etc/fstab
-    file. (LP: #1682160)
-
- -- Scott Moser <smoser@ubuntu.com>  Wed, 12 Apr 2017 11:16:33 -0400
-
-cloud-init (0.7.9-90-g61eb03fe-0ubuntu1) zesty; urgency=medium
+ -- Scott Moser <smoser@ubuntu.com>  Thu, 27 Apr 2017 12:51:04 -0400
 
-  * New upstream snapshot.
-    - OpenStack: add 'dvs' to the list of physical link types. 
-      (LP: #1674946)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 03 Apr 2017 11:10:38 -0400
-
-cloud-init (0.7.9-89-gbf7723e8-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.9-90-g61eb03fe-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
+  * debian/cloud-init.templates: add Bigstep to list of sources. (LP: #1676460)
   * New upstream snapshot.
-    - Fix bug that resulted in an attempt to rename bonds or vlans. 
+    - OpenStack: add 'dvs' to the list of physical link types. (LP: #1674946)
+    - Fix bug that resulted in an attempt to rename bonds or vlans.
       (LP: #1669860)
     - tests: update OpenNebula and Digital Ocean to not rely on host
       interfaces.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 31 Mar 2017 17:02:28 -0400
-
-cloud-init (0.7.9-87-gd23543eb-0ubuntu1) zesty; urgency=medium
-
-  * debian/cloud-init.templates: add Bigstep to list of sources. (LP: #1676460)
-  * New upstream snapshot.
     - net: in netplan renderer delete known image-builtin content.
       (LP: #1675576)
     - doc: correct grammar in capabilities.rst [David Tagatac]
     - ds-identify: fix detecting of maas datasource. (LP: #1677710)
     - netplan: remove debugging prints, add debug logging [Ryan Harper]
     - ds-identify: do not write None twice to datasource_list.
-    - support resizing partition and rootfs on system booted without initramfs.
-      (LP: #1677376) [Steve Langasek]
+    - support resizing partition and rootfs on system booted without
+      initramfs.  [Steve Langasek] (LP: #1677376)
     - apt_configure: run only when needed. (LP: #1675185)
     - OpenStack: identify OpenStack by product 'OpenStack Compute'.
       (LP: #1675349)
     - GCE: Search GCE in ds-identify, consider serial number in check.
       (LP: #1674861)
     - Add support for setting hashed passwords [Tore S. Lonoy] (LP: #1570325)
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 30 Mar 2017 16:46:43 -0400
-
-cloud-init (0.7.9-77-g4a2b2f87-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - Fix filesystem creation when using "partition: auto" [Jonathan Ballet]
-      (LP: #1634678)
-    - ConfigDrive: support reading config drive data from /config-drive for
-      nova-lxd.  (LP: #1673411)
+    - Fix filesystem creation when using "partition: auto"
+      [Jonathan Ballet] (LP: #1634678)
+    - ConfigDrive: support reading config drive data from /config-drive.
+      (LP: #1673411)
     - ds-identify: fix detection of Bigstep datasource. (LP: #1674766)
     - test: add running of pylint [Joshua Powers]
     - ds-identify: fix bug where filename expansion was left on.
     - advertise network config v2 support (NETWORK_CONFIG_V2) in features.
-    - Bigstep: fix bug when executing in python3.
+    - Bigstep: fix bug when executing in python3. [root]
     - Fix unit test when running in a system deployed with cloud-init.
     - Bounce network interface for Azure when using the built-in path.
       [Brent Baude] (LP: #1674685)
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 24 Mar 2017 16:50:56 -0400
-
-cloud-init (0.7.9-68-gef18b8ac-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
     - cloudinit.net: add network config v2 parsing and rendering [Ryan Harper]
     - net: Fix incorrect call to isfile [Joshua Powers] (LP: #1674317)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 20 Mar 2017 16:21:55 -0400
-
-cloud-init (0.7.9-66-g5beecdf8-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - net: add renderers for automatically selecting the renderer. 
+    - net: add renderers for automatically selecting the renderer.
     - doc: fix config drive doc with regard to unpartitioned disks.
       (LP: #1673818)
     - test: Adding integratiron test for password as list [Joshua Powers]
-    - render_network_state: switch arguments around, do not require target 
-    - support 'loopback' as a device type. 
+    - render_network_state: switch arguments around, do not require target
+    - support 'loopback' as a device type.
     - Integration Testing: improve testcase subclassing [Wesley Wiedenmeier]
     - gitignore: adding doc/rtd_html [Joshua Powers]
     - doc: add instructions for running integration tests via tox.
       [Joshua Powers]
-    - test: avoid differences in 'date' output due to daylight savings. 
+    - test: avoid differences in 'date' output due to daylight savings.
     - Fix chef config module in omnibus install. [Jeremy Melvin] (LP: #1583837)
     - Add feature flags to cloudinit.version. [Wesley Wiedenmeier]
-    - tox: add a citest environment 
+    - tox: add a citest environment
     - Support chpasswd/list being a list in addition to a string.
       [Sergio Lystopad] (LP: #1665694)
     - doc: Fix configuration example for cc_set_passwords module.
@@ -556,444 +430,298 @@ cloud-init (0.7.9-66-g5beecdf8-0ubuntu1) zesty; urgency=medium
     - net: do not raise exception for > 3 nameservers
       [Lars Kellogg-Stedman] (LP: #1670052)
 
- -- Scott Moser <smoser@ubuntu.com>  Fri, 17 Mar 2017 21:41:40 -0400
-
-cloud-init (0.7.9-48-g1c795b9-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - ds-identify: report cleanups for config and exit value. (LP: #1669949)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 06 Mar 2017 14:56:28 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 03 Apr 2017 11:52:56 -0400
 
-cloud-init (0.7.9-47-gc81ea53-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.9-48-g1c795b9-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * debian/rules: install Z99-cloudinit-warnings.sh to /etc/profile.d
+  * debian/patches/ds-identify-behavior-xenial.patch: adjust default
+    behavior of ds-identify for SRU (LP: #1669675, #1660385).
   * New upstream snapshot.
     - Support warning if the used datasource is not in ds-identify's list
-      (LP: #1669675)
+      (LP: #1669675).
+    - DatasourceEc2: add warning message when not on AWS. (LP: #1660385)
     - Z99-cloudinit-warnings: Add profile.d script for showing warnings on
-      login.
     - Z99-cloud-locale-test.sh: convert tabs to spaces, remove unneccesary
       execute bit in permissions.
-    - tools/ds-identify: look at cloud.cfg when looking for ec2 strict_id.
-    - tools/ds-identify: fix bug that would mistakingly enable vmware guest
-      customization.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 03 Mar 2017 01:56:19 -0500
-
-cloud-init (0.7.9-38-g83606ae-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - tools/ds-identify: ovf identify vmware guest customization.
-    - Identify Brightbox as an Ec2 datasource user. (LP: #1661693)
-    - DatasourceEc2: add warning message when not on AWS.
-    - ds-identify: add reading of datasource/Ec2/strict_id
-    - tools/ds-identify: add support for 'found' or 'maybe' contributing
-      config.
-    - tools/ds-identify: read the seed directory on Ec2
-    - tools/ds-identify: use quotes in local declarations.
-    - tools/ds-identify: fix documentation of policy setting in a comment.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 24 Feb 2017 22:53:53 -0500
-
-cloud-init (0.7.9-30-gf4e8eb0-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - ds-identify: only run once per boot unless --force is given.
-    - net: correct errors in cloudinit/net/sysconfig.py
-      [Lars Kellogg-Stedman] (LP: #1665441)
-    - ec2_utils: fix MetadataLeafDecoder that returned bytes on empty.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 17 Feb 2017 17:05:47 -0500
-
-cloud-init (0.7.9-26-g1cd8cfa-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - apply the runtime configuration written by ds-identify.
-
- -- Scott Moser <smoser@ubuntu.com>  Tue, 14 Feb 2017 14:45:25 -0500
-
-cloud-init (0.7.9-25-g65529b6-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - ds-identify: fix checking for filesystem label (LP: #1663735)
-    - ds-identify: read ds=nocloud properly (LP: #1663723)
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 10 Feb 2017 15:25:17 -0500
-
-cloud-init (0.7.9-23-g0df21b6-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - support nova-lxd by reading platform from environment of pid 1.
-      (LP: #1661797)
-    - ds-identify: change aarch64 to use the default for non-dmi systems.
-      that default is to enable cloud-init even if no datasources are
-      explicitly found.
-    - Remove style checking during build and add latest style checks to tox
-      [Joshua Powers] (LP: #1652329)
-    - code-style: make master pass pycodestyle (2.3.1) cleanly.
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 09 Feb 2017 13:18:47 -0500
-
-cloud-init (0.7.9-19-ge987092-0ubuntu2) zesty; urgency=medium
-
-  * debian/update-grub-legacy-ec2: fix shell syntax error. (LP: #1662221)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 06 Feb 2017 11:14:11 -0500
-
-cloud-init (0.7.9-19-ge987092-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - manual_cache_clean: When manually cleaning touch a file in instance dir.
-    - Add tools/ds-identify to identify datasources available.
-    - Fix small typo and change iso-filename for consistency [Robin Naundorf]
-    - Fix eni rendering of multiple IPs per interface
-      [Ryan Harper] (LP: #1657940)
-    - tools/mock-meta: support python2 or python3 and ipv6 in both.
-    - tests: remove executable bit on test_net, so it runs, and fix it.
-    - tests: No longer monkey patch httpretty for python 3.4.2
+    - (RedHat) net: correct errors in cloudinit/net/sysconfig.py
+      [Lars Kellogg-Stedman]
+    - ec2_utils: fix MetadataLeafDecoder that returned bytes on empty
+    - Fix eni rendering of multiple IPs per interface [Ryan Harper]
+      (LP: #1657940)
     - Add 3 ecdsa-sha2-nistp* ssh key types now that they are standardized
-      [Lars Kellogg-Stedman] (LP: #1658174)
-    - reset httppretty for each test [Lars Kellogg-Stedman] (LP: #1658200)
-    - build: fix running Make on a branch with tags other than master
-    - EC2: Do not cache security credentials on disk
-      [Andrew Jorgensen] (LP: #1638312)
-    - doc: Fix typos and clarify some aspects of the part-handler
-      [Erik M. Bray]
-    - doc: add some documentation on OpenStack datasource.
+      [Lars Kellogg-Stedman]
+    - EC2: Do not cache security credentials on disk [Andrew Jorgensen]
+      (LP: #1638312)
     - OpenStack: Use timeout and retries from config in get_data.
       [Lars Kellogg-Stedman] (LP: #1657130)
     - Fixed Misc issues related to VMware customization. [Sankar Tanguturi]
-    - Fix minor docs typo: perserve > preserve [Jeremy Bicha]
-    - Use dnf instead of yum when available [Lars Kellogg-Stedman]
-      (LP: #1647118)
-    - validate-yaml: use python rather than explicitly python3
+    - (RedHat) Use dnf instead of yum when available [Lars Kellogg-Stedman]
     - Get early logging logged, including failures of cmdline url.
+    - test / doc / build environment changes
+      - Remove style checking during build and add latest style checks to
+        tox [Joshua Powers]
+      - code-style: make master pass pycodestyle (2.3.1) cleanly, currently
+        [Joshua Powers]
+      - Fix small typo and change iso-filename for consistency
+      - tools/mock-meta: support python2 or python3 and ipv6 in both.
+      - tests: remove executable bit on test_net, so it runs, and fix it.
+      - tests: No longer monkey patch httpretty for python 3.4.2
+      - reset httppretty for each test [Lars Kellogg-Stedman]
+      - build: fix running Make on a branch with tags other than master
+      - doc: Fix typos and clarify some aspects of the part-handler
+        [Erik M. Bray]
+      - doc: add some documentation on OpenStack datasource.
+      - Fix minor docs typo: perserve > preserve [Jeremy Bicha]
+      - validate-yaml: use python rather than explicitly python3
+
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 06 Mar 2017 16:34:10 -0500
+
+cloud-init (0.7.9-0ubuntu1~16.04.2) xenial-proposed; urgency=medium
 
- -- Scott Moser <smoser@ubuntu.com>  Fri, 03 Feb 2017 21:54:39 -0500
+  * debian/update-grub-legacy-ec2: fix shell syntax error. (LP: #1662221)
+
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 06 Feb 2017 16:18:28 -0500
 
-cloud-init (0.7.9-0ubuntu2) zesty; urgency=medium
+cloud-init (0.7.9-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * debian/copyright: update License field to include Apache.
   * debian/update-grub-legacy-ec2: fix to include kernels whose config
     has CONFIG_XEN=y (LP: #1379080).
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 20 Jan 2017 10:01:42 -0500
-
-cloud-init (0.7.9-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - release 0.7.9
+  * debian/patches/azure-use-walinux-agent.patch: continue relying on
+    walinux agent in stable release.
+  * New upstream release.
     - doc: adjust headers in tests documentation for consistency.
+    - pep8: fix issue found in zesty build with pycodestyle.
     - integration test: initial commit of integration test framework
       [Wesley Wiedenmeier]
     - LICENSE: Allow dual licensing GPL-3 or Apache 2.0 [Jon Grimm]
     - Fix config order of precedence, putting kernel command line over system.
       [Wesley Wiedenmeier] (LP: #1582323)
+    - pep8: whitespace fix [Scott Moser]
     - Update the list of valid ssh keys. [Michael Felt]
     - network: add ENI unit test for statically rendered routes.
     - set_hostname: avoid erroneously appending domain to fqdn
       [Lars Kellogg-Stedman] (LP: #1647910)
     - doc: change 'nobootwait' to 'nofail' in docs [Anhad Jai Singh]
-    - Replace an expired bit.ly link in code comment.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 23 Dec 2016 12:54:50 -0500
-
-cloud-init (0.7.8-68-gca3ae67-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
+    - Replace an expired bit.ly link in code comment. [Joshua Harlow]
     - user-groups: fix bug when groups was provided as string and had spaces
-      (LP: #1354694)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 19 Dec 2016 12:35:13 -0500
-
-cloud-init (0.7.8-67-gc9c9197-0ubuntu1) zesty; urgency=medium
-
-  * debian/cherry-pick: add utility for cherry picking commits from upstream
-    into patches in debian/patches.
-  * New upstream snapshot.
-    - mounts: use mount -a again to accomplish mounts (LP: #1647708)
-    - CloudSigma: Fix bug where datasource was not loaded in local search. (LP: #1648380)
-    - when adding a user, strip whitespace from group list (LP: #1354694)
+      [Scott Moser] (LP: #1354694)
+    - when adding a user, strip whitespace from group list
+      [Lars Kellogg-Stedman] (LP: #1354694)
     - fix decoding of utf-8 chars in yaml test
-    - Replace usage of sys_netdev_info with read_sys_net (LP: #1625766)
-    - fix problems found in python2.6 test.
-
- -- Scott Moser <smoser@ubuntu.com>  Sun, 11 Dec 2016 21:22:57 -0500
-
-cloud-init (0.7.8-61-g2d2ec70-0ubuntu1) zesty; urgency=medium
-
-  * debian/grub-legacy-ec2.install: install post(inst|rm) files correctly.
-    [Simon Deziel] (LP: #1581416)
-  * New upstream snapshot.
-    - OpenStack: extend physical types to include hyperv, hw_veb, vhost_user. [Scott Moser] (LP: #1642679)
-    - tests: fix assumptions that expected no eth0 in system. [Scott Moser] (LP: #1644043)
-    - net/cmdline: Consider ip= or ip6= on command line not only ip= [Scott Moser] (LP: #1639930)
+    - Replace usage of sys_netdev_info with read_sys_net
+      [Joshua Harlow] (LP: #1625766)
+    - fix problems found in python2.6 test. [Joshua Harlow]
     - Just use file logging by default [Joshua Harlow] (LP: #1643990)
     - Improve formatting for ProcessExecutionError [Wesley Wiedenmeier]
-    - flake8: fix trailing white space [Scott Moser]
+    - flake8: fix trailing white space
     - Doc: various documentation fixes [Sean Bright]
-    - cloudinit/config/cc_rh_subscription.py: Remove repos before adding [Brent Baude]
-    - packages/redhat: fix rpm spec file. [Scott Moser]
+    - cloudinit/config/cc_rh_subscription.py: Remove repos before adding
+      [Brent Baude]
+    - packages/redhat: fix rpm spec file.
     - main: set TZ in environment if not already set. [Ryan Harper]
-    - Azure: No longer rely on walinux agent. [Scott Moser] (LP: #1538522)
-    - disk_setup: Use sectors as unit when formatting MBR disks with sfdisk. [Daniel Watkins] (LP: #1460715)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 28 Nov 2016 16:08:09 -0500
-
-cloud-init (0.7.8-49-g9e904bb-0ubuntu1) zesty; urgency=medium
-
-  * debian/cloud-init.postinst: update /etc/fstab on Azure to fix
-    future resize operations. (LP: #1611074)
-  * New upstream snapshot.
-    - Add activate_datasource, for datasource specific code paths.
-      Use that on Azure to handle re-formatting of ephemeral disk.
-      (LP: #1611074)
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 18 Nov 2016 16:37:34 -0500
-
-cloud-init (0.7.8-48-g9d826b8-0ubuntu1) zesty; urgency=medium
-
-  * New upstream snapshot.
-    - systemd: cloud-init-local use RequiresMountsFor=/var/lib/cloud
-      (LP: #1642062)
-    - systemd: cloud-init remove After=systemd-networkd-wait-online
-    - systemd: cloud-init-local change Before basic to sysinit
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 15 Nov 2016 17:21:34 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 20 Jan 2017 10:43:12 -0500
 
-cloud-init (0.7.8-45-g584b843-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.4) xenial; urgency=medium
 
-  * New upstream snapshot.
-    - pep8: fix style errors reported by pycodestyle 2.1.0 [Scott Moser]
-    - systemd: drop both Wants and After local-fs.target [Scott Moser]
-    - systemd: networking service adjustments. (LP: #1636912)
-    - systemd: replace Before=basic.target, dbus.target with sysinit.target
-      (LP: #1629797)
-    - doc: Add documentation on stages of boot.
-    - doc: make the RST files consistently formated and other improvements.
-    - Ec2: fix syntax and tox in previous commit.
-    - Ec2: protect against non-dictionary in block-device-mapping.
-    - doc: fixed example to not overwrite /etc/hosts [Chris Glass]
-    - Doc: fix spelling / typos in ca_certs and scripts_vendor.
+  * debian/update-grub-legacy-ec2:
+    - Correctly detect kernels ending in -aws as kernels that can boot on EC2
+      (LP: #1655934)
 
- -- Scott Moser <smoser@ubuntu.com>  Thu, 10 Nov 2016 21:04:09 -0500
+ -- Daniel Watkins <daniel.watkins@canonical.com>  Thu, 12 Jan 2017 11:56:03 +0000
 
-cloud-init (0.7.8-35-gc24187e-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.3) xenial-proposed; urgency=medium
 
-  * New upstream snapshot.
-    - pyflakes: fix issue with pyflakes 1.3 found in ubuntu zesty-proposed.
+  * debian/cherry-pick: use git format-patch rather than git show
+  * cherry-pick a9d41de: CloudSigma: Fix bug where datasource was not
+    loaded in local (LP: #1648380)
+  * cherry-pick c9c9197: mounts: use mount -a again to accomplish mounts
+    (LP: #1647708)
 
- -- Scott Moser <smoser@ubuntu.com>  Mon, 07 Nov 2016 13:31:30 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 13 Dec 2016 16:02:50 -0500
 
-cloud-init (0.7.8-34-ga1cdebd-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.2) xenial-proposed; urgency=medium
 
-  * New upstream snapshot.
-    - net/cmdline: Further adjustments to ipv6 support [LaMont Jones]
-     (LP: #1621615)
-    - Add coverage dependency to bddeb to fix package build.
-    - doc: improve HACKING.rst file
-    - dmidecode: Allow dmidecode to be used on aarch64 [Robert Schweikert]
-    - AliYun: Add new datasource for Ali-Cloud ECS [kaihuan.pkh]
-    - Add coverage collection to tox unit tests. [Joshua Powers]
+  * cherry-pick 18203bf: disk_setup: Use sectors as unit when formatting
+    MBR disks with sfdisk. (LP: #1460715)
+  * cherry-pick 6e92c5f: net/cmdline: Consider ip= or ip6= on command
+    line not only ip= (LP: #1639930)
+  * cherry-pick 8c6878a: tests: fix assumptions that expected no eth0 in
+    system. (LP: #1644043)
+  * cherry-pick 2d2ec70: OpenStack: extend physical types to include
+    hyperv, hw_veb, vhost_user. (LP: #1642679)
 
- -- Scott Moser <smoser@ubuntu.com>  Fri, 04 Nov 2016 11:03:46 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Thu, 01 Dec 2016 16:57:39 -0500
 
-cloud-init (0.7.8-28-gf7a5756-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
+  * debian/cloud-init.postinst: update /etc/fstab on Azure to fix
+    future resize operations. (LP: #1611074)
   * New upstream snapshot.
-    - cc_users_groups: fix remaing call to ds.normalize_user_groups
-      [Ryan Harper]
+    - Add activate_datasource, for datasource specific code paths.
+      (LP: #1611074)
+    - systemd: cloud-init-local use RequiresMountsFor=/var/lib/cloud
+      (LP: #1642062)
 
- -- Scott Moser <smoser@ubuntu.com>  Wed, 26 Oct 2016 09:06:03 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 18 Nov 2016 16:51:54 -0500
 
-cloud-init (0.7.8-27-g29348af-0ubuntu1) zesty; urgency=medium
+cloud-init (0.7.8-47-gb6561a1-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * debian/cloud-init.templates: enable DigitalOcean by default [Ben Howard]
   * New upstream snapshot.
-    - disk-config: udev settle after partitioning in gpt format. (LP: #1626243)
-    - unittests: do not read system /etc/cloud/cloud.cfg.d (LP: #1635350)
-    - Add documentation for logging features. [Wesley Wiedenmeier]
+    - systemd/cloud-init-local.service:
+      + replace 'Wants' and 'After' on local-fs.target with more granular
+        After=systemd-remount-fs.service and RequiresMountsFor=/var/lib
+        and Before=sysinit.target.
+        This is done run sufficiently early enough to update /etc/fstab.
+        (LP: #1611074)
+      + add Before=NetworkManager.service so that cloud-init can render
+        NetworkManager network config before it would apply them.
+    - systemd/cloud-init.service:
+      + add Before=sysinit.target and DefaultDependencies=no (LP: #1611074)
+      + drop Requires=networking.service to work where networking.service is
+        not needed.
+      + add Conflicts=shutdown.target
+      + drop unnecessary Wants=local-fs.target
+    - net: support reading ipv6 dhcp config from initramfs [LaMont Jones]
+      (LP: #1621615)
+    - dmidecode: Allow dmidecode to be used on aarch64, and only attempt
+      usage on x86, x86_64, and aarch64. [Robert Schweikert]
+    - disk-config: udev settle after partitioning in gpt format.
+      (LP: #1626243)
     - Add support for snap create-user on Ubuntu Core images. [Ryan Harper]
       (LP: #1619393)
-    - Fix sshd restarts for rhel distros. [Jim Gorz] (LP: #1470433)
-    - OpenNebula: replace 'ip' parsing with cloudinit.net usage.
-    - Fix python2.6 things found running in centos 6.
+    - Fix sshd restarts for rhel distros. [Jim Gorz]
     - Move user/group functions to new ug_util file [Joshua Harlow]
-    - DigitalOcean: enable usage of data source by default.
     - update Gentoo initscripts to run in the correct order [Matthew Thode]
-    - MAAS: improve the main of datasource to look at kernel cmdline config.
-    - tests: silence the Cheetah UserWarning about NameMapper C version.
-
- -- Scott Moser <smoser@ubuntu.com>  Tue, 25 Oct 2016 17:06:59 -0400
-
-cloud-init (0.7.8-15-g6e45ffb-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - systemd: Run cloud-init.service Before dbus.socket not dbus.target
-      [Daniel Watkins] (LP: #1629797).
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 07 Oct 2016 12:41:38 -0400
-
-cloud-init (0.7.8-14-g94fd35e-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - systemd: run cloud-init.service Before dbus.service (LP: #1629797)
-    - unittests: fix use of mock 2.0 'assert_called' when running make check
-      [Ryan Harper]
-    - Improve module documentation and doc cleanup.  [Wesley Wiedenmeier]
-
- -- Scott Moser <smoser@ubuntu.com>  Tue, 04 Oct 2016 16:46:05 -0400
-
-cloud-init (0.7.8-11-g02f6c4b-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - lxd: Update network config for LXD 2.3 [Stéphane Graber]
-    - DigitalOcean: use meta-data for network configruation [Ben Howard]
-    - ntp: move to run after apt configuration (LP: #1628337)
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 29 Sep 2016 14:30:15 -0400
-
-cloud-init (0.7.8-8-g0439d8a-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
+    - MAAS: improve the debugging tool in datasource to consider
+      config provided on kernel cmdline.
+    - lxd: Update network config for LXD 2.3 [Stéphane Graber] (LP: #1640556)
     - Decode unicode types in decode_binary [Robert Schweikert]
-    - systemd: Ensure that cloud-init-local happens before NetworkManager
     - Allow ephemeral drive to be unpartitioned [Paul Meyer]
-    - subp: add 'update_env' argument
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 23 Sep 2016 16:51:27 -0400
-
-cloud-init (0.7.8-4-g970dbd1-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - net: support reading ipv6 dhcp config from initramfs [LaMont Jones]
-      (LP: #1621615)
-
- -- Scott Moser <smoser@ubuntu.com>  Wed, 21 Sep 2016 11:56:23 -0400
-
-cloud-init (0.7.8-3-g80f5ec4-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
+    - subp: add 'update_env' argument which allows for more easily adding
+      environment variables to a subprocess call.
     - Adjust mounts and disk configuration for systemd. (LP: #1611074)
-    - dmidecode: run dmidecode only on i?86 or x86_64 arch. [Robert Schweikert]
-
- -- Scott Moser <smoser@ubuntu.com>  Tue, 20 Sep 2016 13:59:20 -0400
-
-cloud-init (0.7.8-1-g3705bb5-0ubuntu1) yakkety; urgency=medium
+    - DataSources:
+      + Ec2: protect against non-dictionary in block-device-mapping.
+      + AliYun: Add new datasource for Ali-Cloud ECS, that is
+        available but not enabled by default [kaihuan.pkh]
+      + DigitalOcean: use meta-data for network configuration and
+        enable data source by default. [Ben Howard]
+      + OpenNebula: replace parsing of 'ip' command with similar function
+        available in cloudinit.net.  This fixed unit tests when running
+        in environment with no networking.
+    - doc changes:
+      + Add documentation on stages of boot.
+      + make the RST files consistently formated and other improvements.
+      + fixed example to not overwrite /etc/hosts [Chris Glass]
+      + fix spelling / typos in ca_certs and scripts_vendor.
+      + improve HACKING.rst file
+      + Add documentation for logging features. [Wesley Wiedenmeier]
+      + Improve module documentation and doc cleanup. [Wesley Wiedenmeier]
+    - code style and unit test changes:
+      + pep8: fix style errors reported by pycodestyle 2.1.0
+      + pyflakes: fix issue with pyflakes 1.3 found in ubuntu zesty-proposed.
+      + Add coverage dependency to bddeb to fix package build.
+      + Add coverage collection to tox unit tests. [Joshua Powers]
+      + do not read system /etc/cloud/cloud.cfg.d (LP: #1635350)
+      + tests: silence the Cheetah UserWarning about NameMapper C version.
+      + Fix python2.6 things found running in centos 6.
+
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 15 Nov 2016 17:29:12 -0500
+
+cloud-init (0.7.8-1-g3705bb5-0ubuntu1~16.04.3) xenial-proposed; urgency=medium
+
+  * ntp: move to run after apt configuration (LP: #1628337).
+
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 03 Oct 2016 12:22:26 -0400
+
+cloud-init (0.7.8-1-g3705bb5-0ubuntu1~16.04.2) xenial; urgency=medium
+
+  * Support IPv6 config coming from initramfs.  LP: #1621615.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 23 Sep 2016 20:54:40 -0600
+
+cloud-init (0.7.8-1-g3705bb5-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * New upstream release 0.7.8.
   * New upstream snapshot.
     - systemd: put cloud-init.target After multi-user.target (LP: #1623868)
 
- -- Scott Moser <smoser@ubuntu.com>  Thu, 15 Sep 2016 09:47:11 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Thu, 15 Sep 2016 09:57:27 -0400
 
-cloud-init (0.7.7-31-g65ace7b-0ubuntu1) yakkety; urgency=medium
+cloud-init (0.7.7-31-g65ace7b-0ubuntu1~16.04.2) xenial-proposed; urgency=medium
 
-  * New upstream snapshot.
-    - Allow link type of null in network_data.json [Jon Grimm] (LP: #1621968)
-    - DataSourceOVF: fix user-data as base64 with python3 (LP: #1619394)
+  * debian/control: add Breaks of older versions of walinuxagent (LP: #1623570)
 
- -- Scott Moser <smoser@ubuntu.com>  Mon, 12 Sep 2016 14:56:42 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 14 Sep 2016 16:39:50 -0400
 
-cloud-init (0.7.7-28-g34a26f7-0ubuntu2) yakkety; urgency=medium
+cloud-init (0.7.7-31-g65ace7b-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * debian/control: fix missing dependency on python3-serial,
     and make SmartOS datasource work.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 09 Sep 2016 21:22:13 -0400
-
-cloud-init (0.7.7-28-g34a26f7-0ubuntu1) yakkety; urgency=medium
-
+  * debian/cloud-init.templates fix capitalisation in template so
+    dpkg-reconfigure works to select OpenStack. (LP: #1575727)
+  * d/README.source, d/control, d/new-upstream-snapshot, d/rules: sync
+    with yakkety for changes due to move to git.
+  * d/rules: change PYVER=python3 to PYVER=3 to adjust to upstream change.
+  * debian/rules, debian/cloud-init.install: remove install file
+    to ensure expected files are collected into cloud-init deb.
+    (LP: #1615745)
+  * debian/dirs: remove obsolete / unused file.
+  * upstream move from bzr to git.
   * New upstream snapshot.
-    - systemd: Better support package and upgrade.
-      (LP: #1576692, #1621336)
+    - Allow link type of null in network_data.json [Jon Grimm] (LP: #1621968)
+    - DataSourceOVF: fix user-data as base64 with python3 (LP: #1619394)
+    - remove obsolete .bzrignore
+    - systemd: Better support package and upgrade. (LP: #1576692, #1621336)
     - tests: cleanup tempdirs in apt_source tests
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 09 Sep 2016 16:01:13 -0400
-
-cloud-init (0.7.7-26-g058dd75-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
     - apt config conversion: treat empty string as not provided. (LP: #1621180)
     - Fix typo in default keys for phone_home [Roland Sommer] (LP: #1607810)
     - salt minion: update default pki directory for newer salt minion.
       (LP: #1609899)
     - bddeb: add --release flag to specify the release in changelog.
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 08 Sep 2016 09:36:52 -0400
-
-cloud-init (0.7.7-22-g763f403-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
     - apt-config: allow both old and new format to be present.
       [Christian Ehrhardt] (LP: #1616831)
     - python2.6: fix dict comprehension usage in _lsb_release. [Joshua Harlow]
     - Add a module that can configure spacewalk. [Joshua Harlow]
     - add install option for openrc [Matthew Thode]
     - Generate a dummy bond name for OpenStack (LP: #1605749)
-  * debian/control, debian/README.source: update to reference git.
-  * debian/new-upstream-snapshot: small fixes.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 26 Aug 2016 15:22:13 -0400
-
-cloud-init (0.7.7-17-g40a2f62-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
     - network: fix get_interface_mac for bond slave, read_sys_net for ENOTDIR
     - azure dhclient-hook cleanups
     - Minor cleanups to atomic_helper and add unit tests.
     - Fix Gentoo net config generation [Matthew Thode]
-  * debian/control: drop very old meta-package ec2-init
-  * debian/rules, debian/cloud-init.install: remove install file
-    and use --destdir=debian/cloud-init. (LP: #1615745)
-  * debian/dirs: remove obsolete / unused file.
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 22 Aug 2016 17:02:56 -0400
-
-cloud-init (0.7.7-13-g41271bd-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
     - distros: fix get_primary_arch method use of os.uname [Andrew Jorgensen]
     - Apt: add new apt configuration format [Christian Ehrhardt]
     - Get Azure endpoint server from DHCP client [Brent Baude]
-  * debian/new-upstream-snapshot: update to use git and packaging branches.
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 18 Aug 2016 17:11:51 -0400
-
-cloud-init (0.7.7-10-gbc2c326-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot:
-    - DigitalOcean: use the v1.json endpoint
+    - DigitalOcean: use the v1.json endpoint [Ben Howard]
     - MAAS: add vendor-data support (LP: #1612313)
-    - Upgrade the minimum configobj package to one new enough to work
-    - ConfigDrive: recognize 'tap' as a link type.  (LP: #1610784)
+    - Upgrade to a configobj package new enough to work [Joshua Harlow]
+    - ConfigDrive: recognize 'tap' as a link type. (LP: #1610784)
     - NoCloud: fix bug providing network-interfaces via meta-data.
-      (LP: #1577982)
-    - Add distro tags on config modules that should have it
-    - add ntp config module
+      (LP: 1577982)
+    - Add distro tags on config modules that should have it [Joshua Harlow]
+    - ChangeLog: update changelog for previous commit.
+    - add ntp config module [Ryan Harper]
     - SmartOS: more improvements for network configuration
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 12 Aug 2016 17:18:01 -0400
-
-cloud-init (0.7.7-0ubuntu1) yakkety; urgency=medium
-
-  * New Upstream release.
-
- -- Scott Moser <smoser@ubuntu.com>  Wed, 10 Aug 2016 01:48:32 -0400
-
-cloud-init (0.7.7~git1029-gb56d7a1-0ubuntu1) yakkety; urgency=medium
-
-  * New Upstream snapshot.
+    - tools/read-version: update to address change in version
+    - make-tarball: older versions of git with --format=tar.
+    - read-version: do not attempt git-describe if no git.
+    - Newer requests have strong type validation [Joshua Harlow]
+    - For upstream snapshot versions do not modify git-describe output.
+    - adjust signal_handler for version changes.
+    - revert unintended change to ubuntu sources list
+    - drop modification of version during make-tarball, tools changes.
+    - adjust tools and version information.
+    - Update build tools to work with git [Lars Kellogg-Stedman]
+    - fix pep8 errors in mcollective unit tests
     - mcollective: add tests, cleanups and bug fix when no config in /etc.
-    - Move upstream revision control to git.  [Lars Kellogg-Stedman]
-    - Adjust unit tests to address newer requests have strong type validation.
-  * debian/control: update Standards-Version to 3.9.8
-  * debian/rules: fix PYVER in environment to sync with upstream changes.
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 09 Aug 2016 01:16:28 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 12 Sep 2016 16:05:25 -0400
 
-cloud-init (0.7.7~bzr1256-0ubuntu1) yakkety; urgency=medium
+cloud-init (0.7.7~bzr1256-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * New upstream snapshot.
     - distros/debian.py: fix eni renderer to not render .link files
@@ -1005,87 +733,46 @@ cloud-init (0.7.7~bzr1256-0ubuntu1) yakkety; urgency=medium
     - fix mcollective module that was completely broken if using python3
       (LP: #1597699)
 
- -- Scott Moser <smoser@ubuntu.com>  Thu, 14 Jul 2016 14:54:05 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 15 Jul 2016 13:27:04 -0400
 
-cloud-init (0.7.7~bzr1246-0ubuntu1) yakkety; urgency=medium
+cloud-init (0.7.7~bzr1246-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * New upstream snapshot.
     - fix restoring from a datasource that did not have dsmode (LP: #1596690)
 
- -- Scott Moser <smoser@ubuntu.com>  Mon, 27 Jun 2016 16:28:39 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 27 Jun 2016 16:31:37 -0400
 
-cloud-init (0.7.7~bzr1245-0ubuntu1) yakkety; urgency=medium
+cloud-init (0.7.7~bzr1245-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
-  * New upstream snapshot.
-    - user_data: fix error when user-data is not utf-8 decodable (LP: #1532072)
+  * debian/new-upstream-snapshot: minor change supporting revision
+    passed in as an argument.
+  * debian/control: Build-Depends on python3-unittest2
+  * SRU Upstream to 16.04 (LP: #1595302).
+    - user_data: fix error when user-data is not utf-8 decodable
     - write_files: if no permissions are provided, use the default without
       logging a warning.
-
- -- Scott Moser <smoser@ubuntu.com>  Wed, 22 Jun 2016 15:11:33 -0400
-
-cloud-init (0.7.7~bzr1243-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - do not render systemd.link files (LP: #1594546)
-
- -- Scott Moser <smoser@ubuntu.com>  Mon, 20 Jun 2016 17:14:34 -0400
-
-cloud-init (0.7.7~bzr1242-0ubuntu1) yakkety; urgency=medium
-
-  * d/control: Build-Depends on python3-unittest2
-  * New upstream snapshot.
-    - DataSourceNoCloud: fix stack trace on reboot, default to dsmode=net 
-      (LP: #1592505)
-    - support network rendering to sysconfig (for centos and RHEL)
-    - fix errors reported by pylint
-    - move 'main' into cloudinit.cmd for easier testing. use
-      setuptools entry_points for creating executable.
-    - Remove trailing dot from GCE metadata URL (LP: #1581200)
+    - do not write /etc/systemd/network/50-cloud-init-*.link files
+    - fix several potential errors identified by pylint.
+    - move 'main' into cloudinit/cmd/ for easier testing
+    - Remove trailing dot from GCE metadata URL [Phil Roche]
+    - Refactor cloudinit networking module to improve testing
     - Change missing Cheetah log warning to debug [Andrew Jorgensen]
-    - make networking config provided in system config override datasource.
-      (LP: #1590104)
-
- -- Scott Moser <smoser@ubuntu.com>  Thu, 16 Jun 2016 00:07:12 -0400
-
-cloud-init (0.7.7~bzr1227-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - fix one more unit test to run inside buildd.
-
- -- Scott Moser <smoser@ubuntu.com>  Sat, 04 Jun 2016 20:55:07 -0400
-
-cloud-init (0.7.7~bzr1226-0ubuntu1) yakkety; urgency=medium
-
-  * New upstream snapshot.
-    - fix unit tests to run inside buildd.
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 03 Jun 2016 23:01:16 -0400
-
-cloud-init (0.7.7~bzr1225-0ubuntu1) yakkety; urgency=medium
-
-  * debian/cloud-init.templates fix capitalisation in template so
-    dpkg-reconfigure works to select OpenStack. (LP: #1575727)
-  * New upstream snapshot.
-    - improve network configuration.  Support DreamCompute, RDO openstack
-      and SmartOS networking
-    - remove blocking udev rules (LP: #1577844, LP: #1571761)
-    - support for renaming devices in a container (LP: #1579130).
-    - Apt sources configuration improvements (LP: #1574113)
-    - kernel command line: override all local settings (LP: #1582323)
+    - network configuration improvements
+      - centrally handle 'dsmode' (DataSource mode) to be 'local' or 'net.
+      - support networking information being read on dreamcompute
+      - support reading and applying networking information on SmartOS
+      - improve reading networking from openstack network_data.json
+      - support for renaming devices in a container.
+      - remove blocking of udev rules
+    - Apt sources configuration improvements
+    - cloud-config specified on kernel command line will now override
+      system settings.
     - fix timestamp in reporting events.
+    - Paths: fix instance path if datasource's id has a '/'.
+    - Config Drive: fix check_instance_id signature.
+    - cloudstack: Only use DHCPv4 lease files as a datasource
 
- -- Scott Moser <smoser@ubuntu.com>  Fri, 03 Jun 2016 16:38:55 -0400
-
-cloud-init (0.7.7~bzr1215-0ubuntu1) yakkety; urgency=medium
-
-  * debian/new-upstream-snapshot: minor change supporting revision
-    passed in as an argument.
-  * New upstream snapshot.
-    - Paths: fix instance path if datasource's id has a '/'. (LP: #1575938)
-    - Config Drive: fix check_instance_id signature.  (LP: #1575055)
-    - cloudstack: Only use DHCPv4 lease files as a datasource (LP: #1576273)
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 29 Apr 2016 12:37:48 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 22 Jun 2016 16:06:49 -0400
 
 cloud-init (0.7.7~bzr1212-0ubuntu1) xenial; urgency=medium
 
diff --git a/debian/cloud-init.lintian-overrides b/debian/cloud-init.lintian-overrides
new file mode 100644
index 00000000..591b651e
--- /dev/null
+++ b/debian/cloud-init.lintian-overrides
@@ -0,0 +1,3 @@
+# this explicitly diverts ureadahead.conf in ureadahead package
+# see LP: #499520 for more discussion
+cloud-init binary: diversion-for-unknown-file
diff --git a/debian/cloud-init.maintscript b/debian/cloud-init.maintscript
deleted file mode 100644
index 93aff81c..00000000
+++ /dev/null
@@ -1,8 +0,0 @@
-rm_conffile /etc/init/cloud-config.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-final.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-init-blocknet.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-init-container.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-init-local.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-init-nonet.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-init.conf 0.7.9-243-ge74d775-0ubuntu2~
-rm_conffile /etc/init/cloud-log-shutdown.conf 0.7.9-243-ge74d775-0ubuntu2~
diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst
index f88d1c52..420420b5 100644
--- a/debian/cloud-init.postinst
+++ b/debian/cloud-init.postinst
@@ -276,14 +276,11 @@ fix_azure_upgrade_1611074() {
     rm "$tmpf" || :
 }
 
-cleanup_ureadahead() {
-    local oldver="$1" last_bad_ver="0.7.9-243-ge74d775-0ubuntu2~"
-    dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
-    dpkg-divert --package cloud-init --remove --rename --divert \
-        /etc/init/ureadahead.conf.disabled /etc/init/ureadahead.conf
-}
 
 if [ "$1" = "configure" ]; then
+   # disable ureadahead (LP: #499520)
+   dpkg-divert --package cloud-init --rename --divert \
+      /etc/init/ureadahead.conf.disabled --add /etc/init/ureadahead.conf
    if db_get cloud-init/datasources; then
       values="$RET"
       if [ "${values#*MaaS}" != "${values}" ]; then
@@ -324,8 +321,6 @@ EOF
    disable_network_config_on_upgrade "$2"
 
    fix_azure_upgrade_1611074 "$2"
-
-   cleanup_ureadahead "$2"
 fi
 
 #DEBHELPER#
diff --git a/debian/cloud-init.postrm b/debian/cloud-init.postrm
index 4e20db1c..81b66812 100644
--- a/debian/cloud-init.postrm
+++ b/debian/cloud-init.postrm
@@ -8,6 +8,8 @@ case "$1" in
       rm -f /etc/apt/apt.conf.d/90cloud-init-pipelining
       ;;
    remove)
+      dpkg-divert --package cloud-init --remove --rename --divert \
+            /etc/init/ureadahead.conf.disabled /etc/init/ureadahead.conf
       rm -f /etc/cloud/cloud.cfg.d/90cloud-init-pipelining
       ;;
 esac
diff --git a/debian/control b/debian/control
index 3f46d7bf..1de4f2f5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
                python3-httpretty,
                python3-jinja2,
                python3-jsonpatch,
-               python3-jsonschema,
                python3-mock,
                python3-nose,
                python3-oauthlib,
@@ -29,28 +28,32 @@ Build-Depends: debhelper (>= 9),
 XS-Python-Version: all
 Vcs-Browser: https://git.launchpad.net/cloud-init/?h=ubuntu/devel
 Vcs-Git: git://git.launchpad.net/cloud-init -b ubuntu/devel
-Standards-Version: 3.9.8
+Standards-Version: 3.9.6
 
 Package: cloud-init
 Architecture: all
 Depends: cloud-guest-utils | cloud-utils,
-         nplan | ifupdown,
+         ifupdown (>= 0.6.10ubuntu5),
          procps,
          python3,
-         python3-requests,
+         python3-requests (>= 0.8.2),
          python3-serial,
          ${misc:Depends},
          ${python3:Depends}
+Breaks: walinuxagent (<< 2.1.3-0ubuntu4.1)
 Recommends: eatmydata, gdisk, software-properties-common
+Provides: ec2-init
+Replaces: ec2-init (<<0.5.3)
+Conflicts: ec2-init (<<0.5.3)
 XB-Python-Version: ${python:Versions}
 Description: Init scripts for cloud instances
  Cloud instances need special scripts to run during initialisation
  to retrieve and install ssh keys and to let the user run various scripts.
 
 Package: grub-legacy-ec2
-Depends: debconf | cdebconf,
+Depends: debconf (>= 1.5.19) | cdebconf,
          ucf,
-         util-linux,
+         util-linux (>= 2.15-1),
          ${misc:Depends}
 Conflicts: grub
 Suggests: grub-legacy-doc
@@ -59,3 +62,9 @@ Description: Handles update-grub for ec2 instances
  EC2 instances that use grub-legacy as a bootloader need a way to keep
  /boot/grub/menu.lst up to date while not conflicting with grub-pc.
  This package provides that.
+
+Package: ec2-init
+Depends: cloud-init, ${misc:Depends}
+Architecture: all
+Description: package renamed -> cloud-init
+ This package has been renamed to 'cloud-init'.
diff --git a/debian/grub-legacy-ec2.install b/debian/grub-legacy-ec2.install
index f9ac6281..b75b0bee 100644
--- a/debian/grub-legacy-ec2.install
+++ b/debian/grub-legacy-ec2.install
@@ -1,4 +1,4 @@
 debian/grub-set-default usr/sbin
 debian/grub-set-default-legacy-ec2 usr/sbin
-debian/kernel etc/
+debian/kernel etc/kernel/
 debian/update-grub-legacy-ec2 usr/sbin
diff --git a/debian/patches/azure-use-walinux-agent.patch b/debian/patches/azure-use-walinux-agent.patch
new file mode 100644
index 00000000..c50d664a
--- /dev/null
+++ b/debian/patches/azure-use-walinux-agent.patch
@@ -0,0 +1,17 @@
+Description: Use walinux-agent rather than builtin fabric support
+ Upstream now uses the built-in support for instance initialization on Azure.
+ On a stable release, we want to continue to use the walinux-agent integration.
+ Upstream made this change under bug 1538522.
+Forwarded: not-needed
+Author: Scott Moser <smoser@ubuntu.com>
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -185,7 +185,7 @@ if util.is_FreeBSD():
+     ]
+ 
+ BUILTIN_DS_CONFIG = {
+-    'agent_command': AGENT_START_BUILTIN,
++    'agent_command': AGENT_START,
+     'data_dir': "/var/lib/waagent",
+     'set_hostname': True,
+     'hostname_bounce': {
diff --git a/debian/patches/ds-identify-behavior-xenial.patch b/debian/patches/ds-identify-behavior-xenial.patch
new file mode 100644
index 00000000..cfe8f9a8
--- /dev/null
+++ b/debian/patches/ds-identify-behavior-xenial.patch
@@ -0,0 +1,32 @@
+Description: Adjust behavior of ds-identify for SRU
+ To make this acceptable as a SRU we have changed ds-identify to
+ act in 'report only' mode, and to only 'warn' when it cloud-init
+ finds itself to be using a Ec2 Datasource on an unknown and
+ non AWS platform.
+Forwarded: not-needed
+Author: Scott Moser <smoser@ubuntu.com>
+Bug-ubuntu: http://bugs.launchpad.net/bugs/1669675
+Bug-ubuntu: http://bugs.launchpad.net/bugs/1660385
+
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -83,8 +83,8 @@ _DI_LOGGED=""
+ # set DI_MAIN='noop' in environment to source this file with no main called.
+ DI_MAIN=${DI_MAIN:-main}
+ 
+-DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"
+-DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
++DI_DEFAULT_POLICY="report,found=all,maybe=all,notfound=${DI_ENABLED}"
++DI_DEFAULT_POLICY_NO_DMI="report,found=all,maybe=all,notfound=${DI_ENABLED}"
+ DI_DMI_CHASSIS_ASSET_TAG=""
+ DI_DMI_PRODUCT_NAME=""
+ DI_DMI_SYS_VENDOR=""
+@@ -119,7 +119,7 @@ DI_ON_FOUND=""
+ DI_ON_MAYBE=""
+ DI_ON_NOTFOUND=""
+ 
+-DI_EC2_STRICT_ID_DEFAULT="true"
++DI_EC2_STRICT_ID_DEFAULT="warn"
+ 
+ error() {
+     set -- "ERROR:" "$@";
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..7e909afc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+azure-use-walinux-agent.patch
+ds-identify-behavior-xenial.patch
+stable-release-no-jsonschema-dep.patch
diff --git a/debian/patches/stable-release-no-jsonschema-dep.patch b/debian/patches/stable-release-no-jsonschema-dep.patch
new file mode 100644
index 00000000..f8a11334
--- /dev/null
+++ b/debian/patches/stable-release-no-jsonschema-dep.patch
@@ -0,0 +1,21 @@
+Description: Remove the optional dependency on jsonschema for stable release.
+ To make this acceptable as a SRU we keep the same dependencies as are
+ in the stable release.
+ .
+ The '${python3:Depends}' in debian/control would automatically add the
+ dependency if it is seen in requirements.txt.
+Forwarded: not-needed
+Author: Scott Moser <smoser@ubuntu.com>
+
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -34,7 +34,8 @@ requests
+ jsonpatch
+ 
+ # For validating cloud-config sections per schema definitions
+-jsonschema
++## Do not add dependencies to a stable release (SRU).
++#jsonschema
+ 
+ # For Python 2/3 compatibility
+ six
diff --git a/debian/rules b/debian/rules
index 3e03fed0..f335b7f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-INIT_SYSTEM ?= systemd
+INIT_SYSTEM ?= upstart,systemd
 export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
 
 %:
@@ -17,7 +17,6 @@ override_dh_systemd_start:
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/cloud-init
-	install -D -m 0644 ./tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
+	install -D ./tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
 	install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh
 	install -D ./tools/Z99-cloudinit-warnings.sh debian/cloud-init/etc/profile.d/Z99-cloudinit-warnings.sh
-	install -m 0644 -D debian/apport-launcher.py debian/cloud-init/usr/share/apport/package-hooks/cloud-init.py
diff --git a/debian/update-grub-legacy-ec2 b/debian/update-grub-legacy-ec2
index fb44b6e4..c1c9dc79 100755
--- a/debian/update-grub-legacy-ec2
+++ b/debian/update-grub-legacy-ec2
@@ -1423,6 +1423,7 @@ if ! type is_xen_kernel >/dev/null 2>&1; then
     ver_flavor="${1##*vmlinuz-}"
 
     case "${ver_flavor}" in
+       *-aws) return 0;;
        *-ec2) return 0;;
        *-virtual)
          # 10.04 LTS through 12.04 LTS -virtual is the EC2/Xen kernel