Merge "Use Tempest-lib's availability_zone_client"