Merge "Group testrunner options in --help"