Import patches-unapplied version 2.496 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 58de294714

New changelog entries:
  * Update hostname matches for launchpad buildds to match current practice,
    fixing build failures due to LP being unable to reach
    people.canonical.com.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.496) bionic; urgency=medium
+
+  * Update hostname matches for launchpad buildds to match current practice,
+    fixing build failures due to LP being unable to reach
+    people.canonical.com.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 31 Jan 2018 16:41:23 -0800
+
 livecd-rootfs (2.495) bionic; urgency=medium
 
   * Set ports/archive as appropriate for default mirror - should fix

live-build/auto/config

@@ -27,7 +27,7 @@ if [ -z "$MIRROR" ]; then
 		*.warthogs.hbd.com)	MIRROR=http://ftpmaster.internal/ubuntu/
 					SEEDMIRROR=http://archive-team.internal/seeds/
 					;;
-		*.buildd)		MIRROR=http://ftpmaster.internal/ubuntu/
+		*.ppa|*.scalingstack)	MIRROR=http://ftpmaster.internal/ubuntu/
 					SEEDMIRROR=http://archive-team.internal/seeds/
 					;;
 		*)			case $ARCH in