Import patches-unapplied version 2.413 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 41e1ae746c

New changelog entries:
  * name switch from ubuntu-core to just core was postponed ... temporarily
    revert this bit til we have the necessary snapd bits in place.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.413) yakkety; urgency=medium
+
+  * name switch from ubuntu-core to just core was postponed ... temporarily
+    revert this bit til we have the necessary snapd bits in place.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 30 May 2016 17:43:40 +0200
+
 livecd-rootfs (2.412) yakkety; urgency=medium
 
   * rename the ubuntu-core snap to simply be "core", update the package

live-build/auto/build

@@ -330,7 +330,7 @@ if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
         VERSION="$(lsb_release -r -s)+$(date +20%y%m%d.%H-%M)"
 
         cat > $rootfs/meta/snap.yaml <<EOF
-name: core
+name: ubuntu-core
 version: $VERSION
 summary: The core runtime environment for snapd
 architectures: [$ARCH]