Merge remote-tracking branch 'qubesos/pr/177'

* qubesos/pr/177:
  Use default_dispvm (not default_template) for new DispVM

qubes/app.py

@@ -1184,6 +1184,9 @@ class Qubes(qubes.PropertyHolder):
         # handle default template; specifically allow template=None (do not
         # override it with default template)
         if 'template' not in kwargs and hasattr(cls, 'template'):
+            if cls == self.get_vm_class('DispVM'):
+                kwargs['template'] = self.default_dispvm
+            else:
                 kwargs['template'] = self.default_template
         elif 'template' in kwargs and isinstance(kwargs['template'], str):
             kwargs['template'] = self.domains[kwargs['template']]