Merge "Rename CDM provider config property" into sc-dev