Added :simple_vm_name to "upload_ovf_as_template" options, uploads and register
a template with the given name instead of adding "-#{@computer.name}".

Does not override the default behavior.
Merge branch 'add-vmname-opt'

* add-vmname-opt:
  Added :simple_vm_name to "upload_ovf_as_template" options, uploads and register a template with the given name instead of adding "-#{@computer.name}".