Merge pull request #9169 from Mohit20057/remove-obsolete-client-config-keys Remove obsolete deprecated client Config keys (#8994)