Merge pull request #20107 from calavera/client_auth_store

Client credentials store.