Merge "Fix subunit-trace output with tempest run"