master
7903150: Restructure generated files for jtreg self-tests
7902633: Ignore specified lines in @compile/fail/ref=<file>
Fix golden file