master
7903150: Restructure generated files for jtreg self-tests
7902447: support custom id
Fix/improve handling of duplicate ids