Merge "Switch configuration provider to CBS Client - DCAE SDK"