master
7901941: Consolidate test layout
7903743: Clean up use of JDK[0-9]*HOME in makefiles and test makefiles