Fix regressions introduced in the instance builder
Fix regressions introduced in the instance builder

Related to #5504

youhong316/packer,ChrisLundquist/packer,bryson/packer,KohlsTechnology/packer,p1-nico/packer,dave2/packer,pecigonzalo/packer,KohlsTechnology/packer,arizvisa/packer,mkuzmin/packer,bryson/packer,KohlsTechnology/packer,mitchellh/packer,KohlsTechnology/packer,dave2/packer,arizvisa/packer,ChrisLundquist/packer,markpeek/packer,timsutton/packer,timsutton/packer,routelastresort/packer,tas50/packer,hashicorp/packer,bryson/packer,tas50/packer,mkuzmin/packer,arizvisa/packer,mkuzmin/packer,youhong316/packer,markpeek/packer,routelastresort/packer,tb3088/packer,grubernaut/packer,tas50/packer,markpeek/packer,mitchellh/packer,dave2/packer,rnaveiras/packer,tb3088/packer,taliesins/packer,timsutton/packer,youhong316/packer,grubernaut/packer,ricardclau/packer,mitchellh/packer,ChrisLundquist/packer,tas50/packer,pieter-lazzaro/packer,paulmey/packer,mkuzmin/packer,ChrisLundquist/packer,dave2/packer,bryson/packer,hashicorp/packer,youhong316/packer,KohlsTechnology/packer,hashicorp/packer,KohlsTechnology/packer,smaato/packer,grubernaut/packer,taliesins/packer,p1-nico/packer,youhong316/packer,rnaveiras/packer,smaato/packer,dave2/packer,tb3088/packer,tb3088/packer,rnaveiras/packer,pieter-lazzaro/packer,bryson/packer,mkuzmin/packer,pecigonzalo/packer,grubernaut/packer,routelastresort/packer,bryson/packer,paulmey/packer,p1-nico/packer,pieter-lazzaro/packer,pieter-lazzaro/packer,ricardclau/packer,ChrisLundquist/packer,arizvisa/packer,tas50/packer,hashicorp/packer,tb3088/packer,paulmey/packer,ChrisLundquist/packer,paulmey/packer,routelastresort/packer,taliesins/packer,taliesins/packer,paulmey/packer,ricardclau/packer,p1-nico/packer,rnaveiras/packer,ricardclau/packer,grubernaut/packer,p1-nico/packer,markpeek/packer,smaato/packer,markpeek/packer,youhong316/packer,timsutton/packer,timsutton/packer,ricardclau/packer,pecigonzalo/packer,arizvisa/packer,taliesins/packer,taliesins/packer,mitchellh/packer,smaato/packer,timsutton/packer,rnaveiras/packer,markpeek/packer,ricardclau/packer,mkuzmin/packer,grubernaut/packer,dave2/packer,rnaveiras/packer,routelastresort/packer,tas50/packer,paulmey/packer,pecigonzalo/packer,smaato/packer,pieter-lazzaro/packer,tb3088/packer,p1-nico/packer,arizvisa/packer,mitchellh/packer,smaato/packer,pieter-lazzaro/packer