merge from 'apache/lucene-solr' Branch 4x 20140628