tested VMware and VirtualBox fixes
pulled in host_ip from wrong place
make format
Merge branch 'pr1169_and_fixes' of https://github.com/JNPRAutomate/packer into pr1169_and_fixes