Merge "Make identity clients use rest_client"