[EC2 knife-cloud] merge Fog/Excon Error PR

Base branch for this PR is https://github.com/ClogenyTechnologies/knife-ec2/tree/pd/ec2_sync_master.

@muktaa