Bugfixes for FreeBSD 10

```tools_upload_flavor``` went missing from VMWare templates so that breaks the VMWare build and builder names changed in Packer.