Merge "Fix testrunner.py reporting"