Merge "Make database/telemetry clients use rest_client"