fix conflict from mergeing too many things to master at once
fix conflict from mergeing too many things to master at once

dave2/packer,rnaveiras/packer,timsutton/packer,grubernaut/packer,rnaveiras/packer,tas50/packer,rnaveiras/packer,pecigonzalo/packer,mitchellh/packer,timsutton/packer,tas50/packer,bryson/packer,dave2/packer,grubernaut/packer,hashicorp/packer,grubernaut/packer,mitchellh/packer,mitchellh/packer,timsutton/packer,paulmey/packer,paulmey/packer,dave2/packer,pecigonzalo/packer,paulmey/packer,bryson/packer,paulmey/packer,bryson/packer,tas50/packer,tas50/packer,paulmey/packer,ricardclau/packer,pecigonzalo/packer,ricardclau/packer,ricardclau/packer,rnaveiras/packer,grubernaut/packer,timsutton/packer,pecigonzalo/packer,bryson/packer,hashicorp/packer,dave2/packer,tas50/packer,grubernaut/packer,rnaveiras/packer,tas50/packer,grubernaut/packer,rnaveiras/packer,timsutton/packer,paulmey/packer,bryson/packer,mitchellh/packer,dave2/packer,dave2/packer,ricardclau/packer,ricardclau/packer,timsutton/packer,mitchellh/packer,ricardclau/packer,hashicorp/packer,bryson/packer,hashicorp/packer