Set JDK version (7)
Merge remote-tracking branch 'origin' into solr40