LUCENE-5555: Fix SortedInputIterator to correctly encode/decode contexts in presence of payload

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582474 13f79535-47bb-0310-9956-ffa450edef68
remove bogus setting in test (see explanation on the mail list: this test cares about how many tokens it indexes because it expects there to be exactly 1 term

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582479 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1582549 from lucene/dev/trunk:
SOLR-5914: Fix missing close on Reader

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582550 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5514: Remove one more Java 6 hack

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582557 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5514: Remove one more Java 6 hack

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582559 13f79535-47bb-0310-9956-ffa450edef68
don't try to index megaterms, take 2

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582642 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5466: A new List collections and cluster status API which clients can use to read collection and shard information instead of reading data directly from ZooKeeper

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582736 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4478: Use CloudConfigSetService with embedded zk server

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582840 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1582886 from lucene/dev/trunk:
Remove broken Javadoc parts on private method

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582887 13f79535-47bb-0310-9956-ffa450edef68
add tests for fst term dictionaries

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582925 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5920: Distributed sort on DateField, BoolField and BCD{Int,Long,Str}Field returns string cast exception (merged trunk r1582929)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582933 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5920: fix CursorMarkTest.getRandomCollation() to call termAtt.fillBytesRef() and ts.end() (merged trunk r1582934)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582935 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5920: mergeprops (merged trunk r1582934)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582936 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5920: Fix forbidden-api-check failure

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582952 13f79535-47bb-0310-9956-ffa450edef68
Adding svn:eol-style native

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582964 13f79535-47bb-0310-9956-ffa450edef68
fix broken link

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1583151 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5920: IntelliJ config: fix solr-core-tests dependency module name analysis-icu -> icu (merged trunk r1583159)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1583160 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5936: Deprecate non-Trie-based numeric & date field types

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1583179 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5934: LBHttpSolrServer exception handling improvement and small test improvements.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1583214 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5934: Revert 4x commit.

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