Merge proposals dependent on lp://staging/~andreserl/maas/fix_virsh_template

lp://staging/~andreserl/maas/fix_virsh_template has no merge proposals.