add retrieveCredentials() to CredentialStore
Merge remote-tracking branch 'upstream2/master'