Merge branch 'master' into add-keep-failed-build-option
Merge branch 'master' into add-log-to-web-server
Merge branch 'master' into add-reset-to-web-server
Merge branch 'master' into add-upload-to-web-server
Merge branch 'master' into log-http-requests
Adds security group support

Allows security groups to be specified in the template.
Merge branch 'master' into add-keep-failed-build-option
Merge branch 'master' into add-log-to-web-server
Merge branch 'master' into add-reset-to-web-server
Merge branch 'master' into add-upload-to-web-server
Merge branch 'master' into log-http-requests
Merge pull request #848 from nebula/securityGroups

Support for Security Groups in Openstack
Update CHANGELOG
website: update openstack for security groups
builder/parallels: fixed Builder ID

Caused by changing namespace to 'packer.*' (3a68c8a)
Revert the way to retrieve vm ip in VMware ESXi Driver
website: Document that the Remote ESXi Driver supports ESXi 5.1 and above, and needs to enable GuestIPHack
Appending wildcard to src causes problems

It appears that the desired effect was to support
    src = "dir" -> dest/dir
    src = "dir/" -> dest

but cp -R already handles this, provided the trailing slash does not
get consumed by the shell.

The wildcard causes problems when multiple files match the
shell glob, e.g.

UploadDir("/tmp", "./salt*", [])

where my working dir contains
 - salt
 - salt-foo

will error.
Merge pull request #1110 from higebu/revert-the-way-to-retrieve-vm-ip-in-esxi-driver

Revert the way to retrieve VM IP in Remote ESXi Builder
Merge pull request #1111 from njhartwell/master

builder/amazon/chroot: Appending wildcard to src causes problems