Merge "Add AWS credentials config file"