Conflicts:
	packer/config_template.go
	website/source/docs/templates/configuration-templates.html.markdown

common: Fixes #1114, Adds upper and lower as filters for the template engine.

Merge branch 'add-chef-environment' of github.com:cfortier2/packer into cfortier2-add-chef-environment

Conflicts:
	provisioner/chef-client/provisioner.go

[GH-1388]

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

vmware-iso/esxi: fix multiple issues with VNC address discovery

builder/googlecompute: uses new auth style