diff -Nru lxc-1.0.8/debian/changelog lxc-1.0.8/debian/changelog
--- lxc-1.0.8/debian/changelog	2015-11-09 23:23:56.000000000 +0000
+++ lxc-1.0.8/debian/changelog	2015-11-13 17:53:35.000000000 +0000
@@ -1,3 +1,14 @@
+lxc (1.0.8-0ubuntu0.2) trusty; urgency=medium
+
+  * Cherry-pick from upstream:
+    - Fix ubuntu-cloud template to detect compression algorithm instead
+      of hardcoding xz. Also update list of supported releases and use trusty
+      as the fallback release. (LP: #1515463)
+  * Update lxc-tests description to make it clear that this package is
+    meant to be used by developers and by automated testing.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Fri, 13 Nov 2015 12:53:17 -0500
+
 lxc (1.0.8-0ubuntu0.1) trusty; urgency=medium
 
   * New upstream bugfix release. (MRE tracking bug: LP: #1514623)
diff -Nru lxc-1.0.8/debian/control lxc-1.0.8/debian/control
--- lxc-1.0.8/debian/control	2015-11-09 23:15:27.000000000 +0000
+++ lxc-1.0.8/debian/control	2015-11-13 17:53:07.000000000 +0000
@@ -105,7 +105,9 @@
  created using the Control Group and Namespace features included in the Linux
  kernel.
  .
- This package contains the test binaries.
+ This package contains the test binaries. Those binaries are primarily
+ used for autopkgtest and by some developers. They are not meant to be
+ installed on regular user systems.
 
 Package: liblxc1
 Architecture: linux-any
diff -Nru lxc-1.0.8/debian/.git-dpm lxc-1.0.8/debian/.git-dpm
--- lxc-1.0.8/debian/.git-dpm	2015-11-09 23:15:27.000000000 +0000
+++ lxc-1.0.8/debian/.git-dpm	2015-11-13 17:53:07.000000000 +0000
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-3e3c933900c23edf4e378127b6520c91e9f87546
-3e3c933900c23edf4e378127b6520c91e9f87546
+2452a0458c96ebbf0b14b8f9b71c581036e8fad9
+2452a0458c96ebbf0b14b8f9b71c581036e8fad9
 4d4ae2d76b719cb54dbdeea8f371aedb309b820a
 4d4ae2d76b719cb54dbdeea8f371aedb309b820a
 lxc_1.0.8.orig.tar.gz
diff -Nru lxc-1.0.8/debian/patches/0002-ubuntu-cloud-Various-fixes.patch lxc-1.0.8/debian/patches/0002-ubuntu-cloud-Various-fixes.patch
--- lxc-1.0.8/debian/patches/0002-ubuntu-cloud-Various-fixes.patch	1970-01-01 00:00:00.000000000 +0000
+++ lxc-1.0.8/debian/patches/0002-ubuntu-cloud-Various-fixes.patch	2015-11-13 17:53:07.000000000 +0000
@@ -0,0 +1,65 @@
+From 2452a0458c96ebbf0b14b8f9b71c581036e8fad9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Thu, 12 Nov 2015 12:44:38 -0500
+Subject: ubuntu-cloud: Various fixes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ - Update list of supported releases
+ - Make the fallback release trusty
+ - Don't specify the compression algorithm (use auto-detection) so that
+   people passing tarballs to the template don't see regressions.
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
+---
+ templates/lxc-ubuntu-cloud.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
+index 3f30a61..d277fec 100644
+--- a/templates/lxc-ubuntu-cloud.in
++++ b/templates/lxc-ubuntu-cloud.in
+@@ -25,7 +25,7 @@ STATE_DIR="@LOCALSTATEDIR@"
+ HOOK_DIR="@LXCHOOKDIR@"
+ CLONE_HOOK_FN="$HOOK_DIR/ubuntu-cloud-prep"
+ LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
+-KNOWN_RELEASES="precise trusty utopic vivid"
++KNOWN_RELEASES="precise trusty vivid wily xenial"
+ skip_arch_check=${UCTEMPLATE_SKIP_ARCH_CHECK:-0}
+ 
+ # Make sure the usual locations are in PATH
+@@ -159,8 +159,8 @@ eval set -- "$options"
+ 
+ mapped_uid=-1
+ mapped_gid=-1
+-# default release is precise, or the systems release if recognized
+-release=precise
++# default release is trusty, or the systems release if recognized
++release=trusty
+ if [ -f /etc/lsb-release ]; then
+     . /etc/lsb-release
+     rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
+@@ -183,7 +183,7 @@ else
+         arch="amd64"
+     elif [ "$arch" = "armv7l" ]; then
+         # note: arm images don't exist before oneiric;  are called armhf in
+-        # precise and later;  and are not supported by the query, so we don't actually
++        # trusty and later;  and are not supported by the query, so we don't actually
+         # support them yet (see check later on).  When Query2 is available,
+         # we'll use that to enable arm images.
+         arch="armhf"
+@@ -330,10 +330,10 @@ do_extract_rootfs() {
+     mkdir -p $rootfs
+     cd $rootfs
+     if [ $in_userns -eq 1 ]; then
+-        tar --anchored --exclude="dev/*" --numeric-owner -xpJf "$cache/$filename"
++        tar --anchored --exclude="dev/*" --numeric-owner -xpf "$cache/$filename"
+         mkdir -p $rootfs/dev/pts/
+     else
+-        tar --numeric-owner -xpJf "$cache/$filename"
++        tar --numeric-owner -xpf "$cache/$filename"
+     fi
+ }
+ 
diff -Nru lxc-1.0.8/debian/patches/series lxc-1.0.8/debian/patches/series
--- lxc-1.0.8/debian/patches/series	2015-11-09 23:15:27.000000000 +0000
+++ lxc-1.0.8/debian/patches/series	2015-11-13 17:53:07.000000000 +0000
@@ -1 +1,2 @@
 0001-Trusty-Swap-out-the-CVE-2015-1335-fix-with-the-trust.patch
+0002-ubuntu-cloud-Various-fixes.patch