Merge pull request #378 from justinsb/increase_ssh_timeout

builder/openstack: Increase default SSH timeout from 1m -> 5m
Fix typo

s/Detatching/Detaching/
Merge pull request #381 from greenalto/typo

builder/vmware: fix typo
Merge pull request #379 from justinsb/justinsb-openstack_ipv6_support

builder/openstack: Support IPv6 access address for Openstack
Merge branch 'upstream'