Update for branch Solr-4.x