Update AWS CLI to work with latest botocore config changes
Merge branch 'cred-file' into develop

* cred-file:
  Update AWS CLI to work with latest botocore config changes