This will allow for the use of instance roles rather than the AWS_ACCOUNT_ID and credentials file, it will only pass the check for the AWS_ACCOUNT_ID if the credentials come from an iam-role avoiding issues with other forms of credentials.
Sorry, I realized I had mixed this and the other pull request I was going to make into one branch somehow, I canceled it and will clean things up and make it as two separate requests.
This will allow for the use of instance roles rather than the AWS_ACCOUNT_ID and credentials file, it will only pass the check for the AWS_ACCOUNT_ID if the credentials come from an iam-role avoiding issues with other forms of credentials.