Merge "Deduplicate cert, audit_log and tenant_net client"