Pd/ec2 sync master

Rspec 2 deprecations corrected.

Synced ec2 knife-cloud with master (upto 24th April)