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

Imported using git-ubuntu import.

Changelog parent: 9fadf2c648

New changelog entries:
  * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.400) xenial; urgency=medium
+
+  * Transition from ubuntu-snappy to ubuntu-core-snapd-units and snapd.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 13 Apr 2016 22:57:39 -0600
+
 livecd-rootfs (2.399) xenial; urgency=medium
 
   [ Oliver Grawert ]

live-build/auto/config

@@ -365,7 +365,8 @@ case $PROJECT in
 			add_package install ppp
 			add_package install watchdog
 			# no Task: header yet
-			add_package install ubuntu-snappy
+			add_package install snapd
+			add_package install ubuntu-core-snapd-units
 
 			# no minimal as we want to be really minimal
 			#add_task install minimal