Merge "simplify rest_client logging"