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