Merge branch 'hotfix-2.22.1'
Support for multiple credential profiles.
Merge remote-tracking branch 'zachm/add_profile_credentials_config' into develop
Fixes #1979.