Import patches-unapplied version 2.468 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: b053111651

New changelog entries:
  [ Dimitri John Ledkov ]
  * Drop obsolete fix-ups of resolv.conf, debootstrap should now result in
    correct symlink to resolved without any further fixes.
  [ Michael Hudson-Doyle ]
  * Have subiquity.service order after on a service defined by the subiquity
    snap, which in turn will order after the job that mounts the subiquity
    snap. (LP: #1721414)

debian/changelog

@@ -1,3 +1,16 @@
+livecd-rootfs (2.468) artful; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * Drop obsolete fix-ups of resolv.conf, debootstrap should now result in
+    correct symlink to resolved without any further fixes.
+
+  [ Michael Hudson-Doyle ]
+  * Have subiquity.service order after on a service defined by the subiquity
+    snap, which in turn will order after the job that mounts the subiquity
+    snap. (LP: #1721414)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 06 Oct 2017 12:52:43 +1300
+
 livecd-rootfs (2.467) artful; urgency=medium
 
   * fix remaining wrong references to /etc/default/grub.d/40-partuuid

live-build/ubuntu-core/includes.chroot/etc/resolv.conf

@@ -1 +0,0 @@
-../run/resolvconf/resolv.conf

live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf

@@ -1 +0,0 @@
-../run/resolvconf/resolv.conf

live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf

live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Subiquity, the installer for Ubuntu Server
 After=systemd-user-sessions.service plymouth-quit-wait.service
-After=rc-local.service
+After=rc-local.service snap.subiquity.started.service
 Requires=snapd.service
 IgnoreOnIsolate=yes
 ConditionPathExists=/dev/tty0