`client_config` should also support receiving it's own defaults.
Merge pull request #3337 from s0undt3ch/develop

`client_config` should also support receiving it's own defaults.