Make vSphere ovf metadata compatible with vSphere 4 and 5

This change to the metadata allows import of the OVA to both
vSphere 4 and vSphere 5 without warning, and more accurately
represents the operating system type.
Merge pull request #314 from eggmaster/vsphere_template_edit

Make vSphere ovf metadata compatible with vSphere 4 and 5