Merge "Fix testrunner to cope with degenerate testlists" into pi-dev