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

Imported using git-ubuntu import.

Changelog parent: b479b0b368

New changelog entries:
  * Produce OVA files for i386 cloud builds.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.370) xenial; urgency=medium
+
+  * Produce OVA files for i386 cloud builds.
+
+ -- Daniel Watkins <daniel.watkins@canonical.com>  Wed, 13 Jan 2016 11:51:51 +0000
+
 livecd-rootfs (2.369) xenial; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]

live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary

@@ -9,17 +9,20 @@
 #
 # For this step, we re-use the VMDK's made in 040-vmdk-image.binary
 
-cur_d=${PWD}
-my_d=$(dirname $(readlink -f ${0}))
-
 architecture=$(chroot chroot dpkg --print-architecture)
 
-base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
 case ${architecture} in
-        amd64) base_vmdk="livecd.ubuntu-cpc.uefi.vmdk";;
+        amd64|i386) ;;
                  *) echo "OVA images are not supported for ${architecture} yet.";
                      exit 0;;
 esac
+cur_d=${PWD}
+my_d=$(dirname $(readlink -f ${0}))
+
+base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
+if [ $architecture = "amd64" ]; then
+    base_vmdk="livecd.ubuntu-cpc.uefi.vmdk"
+fi
 
 if [ ! -e ${base_vmdk} ]; then
     find . | grep vmdk