Merge "Switch to using subunit-trace from tempest-lib"