fixed timeout
Merge branch 'instance-metadata' into feature-ec2