Add more error handling to the ec2 module, remove Python 2.6ism
Merge pull request #2035 from tgerla/devel

Add more error handling to the ec2 module, remove Python 2.6ism