Restored the upstream lucene_solr_4_6 branch into the local repository.
git gc was not really effective.
Split off efdiscache branch plan