Changes for knife-ec2 0.10.0.rc.1