Merging zts's pull request into opscode's knife-ec2