Bug#861282: changes merged upstream

[Matthew Hooker]

Hi All,

The original patch should not be used in any distributed version of packer.
A complete fix has been merged into packer master. Please double check the
complete patch here https://github.com/hashicorp/packer/pull/4900

Thanks,
--Matt Hooker