prevent aws from hanging when determining if there is an EC2 role (and secrets are not yet defined)
Merge branch 'master' of github.com:timkay/aws