Merge "Fix logging of console output in scenario tests"