Merge "[Tempest] Fix concurrency in test with listing share servers"