Merge "Remove remaining CONF references in service_client"