Import solr version 0.1.2
Import java version 1.21.2
Merge branch 'chef-vendor-java'