Merge "Fix concurrency issue in tempest test"