Merge "Make volume clients use rest_client"