Merge pull request #3765 from jboeuf/core_creds_api_change

Core credentials API refactoring