Merge branch 'additional-user-variables' of github.com:nBerg/packer into nBerg-additional-user-variables

Conflicts:
	builder/amazon/common/run_config.go