Merge "Fix stable/train testing with tempest 26.1.0"