Merge "Remove CONF values from telemetry client"