Merge "Remove CONF values from identity clients"