Merge remote-tracking branch 'qubesos/pr/86' into release3.2

* qubesos/pr/86:
  Configure for build of artful templates, and remove zesty.

Makefile.builder

@@ -16,7 +16,7 @@ source-debian-quilt-copy-in:
 	if [ $(DIST) == trusty ] ; then \
 		sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi
-	if [ $(DIST) == zesty ] ; then \
+	if [ $(DIST) == artful ] ; then \
 		sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi
 	-$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches)