SOLR-4682: CoreAdminRequest.mergeIndexes can not merge multiple cores or indexDirs

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465196 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4877: fix CHANGES entry to be under 4.3

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465227 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4675: Improve PostingsHighlighter integration

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465228 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4683: add BreakIterator config to PostingsSolrHighlighter

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465249 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4911: Add "cela" to the list of French stop words, as suggested by Pierre Kobylanski.


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465256 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4684: add encoder config to PostingsSolrHighlighter

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465258 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4911: Synchronize Solr stopwords list.


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465259 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk