Bugfixes for FreeBSD 10: tools_upload_flavor went missing from VMWare templates, and builder names changed in Packer.