Merge "Remove CONF usage from dynamic_creds module"