Strangeness around "Client" and "ClientCredentials"

[bshaffer]

When you are setting storages using array keys, there is some strangeness with "client" and "client_credentials". You expect them to almost always be the same.

Add some logic in the server to set both if just one is set explicitly, so that you only specify them differently if they are two different objects.