Merge branch '1082-add-boot-commands-to-vmx-and-ovf-builders' of github.com:rasa/packer into rasa-1082-add-boot-commands-to-vmx-and-ovf-builders

Conflicts:
	builder/virtualbox/ovf/config.go
	builder/vmware/vmx/config.go