knife-ec2 master to knife-ec2 knife-cloud sync

Rspec deprecation solved.

Sync knife-ec2 knife-cloud with knife-ec2 master  (upto 24th April)