Fixing timeout, support for AWS style metadata query for cfn tools