Unify var usage
Support CloudSearch usage of AWS_CREDENTIAL_FILE
still keep it only one file