master
7901941: Consolidate test layout
7904133: jtreg doesn't generate an error when @key tag is used more than once in a test definition