(Java) Add Java version check
Merge branch 'master' of rosecompiler1.llnl.gov:rose/edg4x/rose
Merge branch 'master' of rosecompiler1.llnl.gov:rose/edg4x/rose
(X10) Re-enable conditional for X10 support; off by default