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

* qubesos/pr/118:
  Fixed incorrect kernel display in VM settings

qubesmanager/utils.py

@@ -60,6 +60,8 @@ def prepare_choice(widget, holder, propname, choice, default,
             oldvalue = qubesadmin.DEFAULT
         else:
             oldvalue = getattr(holder, propname)
+            if oldvalue == '':
+                oldvalue = None
             if transform is not None and oldvalue is not None:
                 oldvalue = transform(oldvalue)
     else: