Update to 2.1.5
Update to latest ec2-api-tools
Update to 4.01004