Merge branch 'issue_2080' of https://github.com/rickard-von-essen/packer into rickard-von-essen-issue_2080

Adding disable sudo support to salt masterless

Merge branch 'ansible-inventory-groups' of https://github.com/lyrixx/packer into lyrixx-ansible-inventory-groups

[vsphere post processor] Make ResourcePool optional. Upload the template to an specific host

Local shell provisioner

provisioner/shell: retry file delete [GH-2286]

resume download after fail

/cc @cbednarski

builder/amazon-ebs: Clean up orphan volumes

/cc @pearkes - This fixes that crash