Merge "Use Tempest-lib's compute services_client"