Refactor ClientConfiguration's internal implementation

The ClientConfiguration class has grown "thorny" over the last couple of years. A better, cleaner approach needs to be implemented as it is getting difficult to maintain (regressions, missing parts, etc).

Any candidate solution should:

• Not impact existing users
• Not impact external, published API
• Ensure of no internal regressions