=== modified file 'cloudinit/sources/DataSourceConfigDrive.py'
--- cloudinit/sources/DataSourceConfigDrive.py	2016-05-26 15:22:39 +0000
+++ cloudinit/sources/DataSourceConfigDrive.py	2016-06-02 18:57:55 +0000
@@ -330,7 +330,8 @@
         subnets = []
         cfg = {k: v for k, v in link.items()
                if k in valid_keys['physical']}
-        cfg.update({'name': link['id']})
+        if 'name' in link:
+            cfg.update({'name': link['name']})
         for network in [net for net in networks
                         if net['link'] == link['id']]:
             subnet = {k: v for k, v in network.items()

=== modified file 'packages/debian/changelog.in'
--- packages/debian/changelog.in	2015-02-10 20:32:32 +0000
+++ packages/debian/changelog.in	2016-06-02 13:35:35 +0000
@@ -1,5 +1,5 @@
 ## template:basic
-cloud-init (${version}~bzr${revision}-1) UNRELEASED; urgency=low
+cloud-init (${version}~bzr${revision}-1) xenial; urgency=low
 
   * build