Merge from 3.3: Issue #15324: Fix regrtest --fromfile, --match, --randomize.