Import patches-unapplied version 2.391 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: f51f8e92a5

New changelog entries:
  * adjust snap versions to only have one dash and use plus chars instead

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.391) xenial; urgency=medium
+
+  * adjust snap versions to only have one dash and use plus chars instead
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 21 Mar 2016 17:36:47 +0100
+
 livecd-rootfs (2.390) xenial; urgency=medium
 
   * add link for wlan mac address in dragonboard kernel snaps

live-build/auto/build

@@ -327,7 +327,7 @@ if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
             mkdir -p $rootfs/$dir
         done
 
-        VERSION="$(lsb_release -r -s)-$(date +20%y%m%d-%H-%M)"
+        VERSION="$(lsb_release -r -s)+$(date +20%y%m%d.%H-%M)"
 
         cat > $rootfs/meta/snap.yaml <<EOF
 name: ubuntu-core
@@ -558,7 +558,7 @@ EOF
         ln -s $initrd initrd.img
         kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')"
 
-        VERSION=$kvers-$(date +20%y%m%d-%H-%M)
+        VERSION=$kvers+$(date +20%y%m%d.%H-%M)
 
         cat > meta/snap.yaml <<EOF
 name: $metaname