I commited the fix above in git.debian.org:/git/cloud/debian-vm-templates.git the next box rebuild will have this included.