LUCENE-5538: FastVectorHighlighter fails with booleans of phrases

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1579269 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5782: The full MapReduceIndexer help text does not display when using --help.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1579307 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1579402 from lucene/dev/branches/branch_4x:
Merged revision(s) 1579399 from lucene/dev/trunk:
LUCENE-5540: Update forbidden-apis, pegdown, groovy

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1579406 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5824: Merge up Solr MapReduce contrib code to latest external changes. Includes a few minor bug fixes.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1579648 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5544: Exceptions during IW.rollback can leak files and locks

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1579983 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5895: JavaBinLoader hides IOExceptions

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580293 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1575337 from lucene/dev/branches/branch_4x:
unescape %20 in urls so we don't get false failures with 1.7.0_60

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580613 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5880: @BadApple this test method for now.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580701 13f79535-47bb-0310-9956-ffa450edef68
tests: improve test

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580757 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5861: Recovery should not set onlyIfLeaderActive=true for slice in 'recovery' state

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580919 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5423: CSV output doesn't include function field (merged branch_4x r1571559)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580965 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5550: shards.info is not returned by a short circuited distributed query

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580979 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5818: distrib search with custom comparator does not quite work correctly

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1580987 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5777: Fix ordering of field values in JSON updates where field name key is repeated (merged branch_4x r1572271)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581014 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4978: spatial grid false-negatives at edge

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581017 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4978: invert biasContains on query side

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581019 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5549: punting on this test bug for now

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581020 13f79535-47bb-0310-9956-ffa450edef68
Fix test failure when not geo and query is point that falls on shared grid border and predicate is Within.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581022 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5734: We should use System.nanoTime rather than System.currentTimeMillis when calculating elapsed time. (merged branch_4x r1573426)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581162 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5760: ConcurrentUpdateSolrServer has a blockUntilFinished call when streamDeletes is true that should be tucked into the if statement below it. (merged branch_4x r1573441)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1581168 13f79535-47bb-0310-9956-ffa450edef68