SOLR-3939: Consider a sync attempt from leader to replica that fails due to 404 a success.
SOLR-3940: Rejoining the leader election incorrectly triggers the code path for a fresh cluster start rather than fail over.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1397672 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 5bd06252c761bc223dd21387f9164ee0f64c96a4)

Conflicts:

	solr/CHANGES.txt
SOLR-3933: Distributed commits are not guaranteed to be ordered within a request.

SOLR-3939: An empty or just replicated index cannot become the leader of a shard after a leader goes down.

SOLR-3971: A collection that is created with numShards=1 turns into a numShards=2 collection after starting up a second core and not specifying numShards.

SOLR-3932: SolrCmdDistributorTest either takes 3 seconds or 3 minutes.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1402361 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9a3c7b9b695c7163342f24adfb130429e22d2538)

Conflicts:

	solr/CHANGES.txt
SOLR-3933: Distributed commits are not guaranteed to be ordered within a request.

SOLR-3939: An empty or just replicated index cannot become the leader of a shard after a leader goes down.

SOLR-3971: A collection that is created with numShards=1 turns into a numShards=2 collection after starting up a second core and not specifying numShards.

SOLR-3932: SolrCmdDistributorTest either takes 3 seconds or 3 minutes.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1402362 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e3377d2de59d045deb4abd9d407bf5c15b9c9cad)

Conflicts:

	solr/CHANGES.txt
SOLR-3995: Recovery may never finish on SolrCore shutdown if the last reference to a SolrCore is closed by the recovery process
SOLR-3994:Create more extensive tests around unloading cores.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1402396 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 65621e21b921bdf5aa25fb29149d1b522a4f614b)

Conflicts:

	solr/CHANGES.txt
SOLR-4009: OverseerCollectionProcessor is not resiliant to many error conditions and can stop running on errors.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1403482 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit b7df4efae9a5e6aedb8ea008e919eb3ce56d2b9e)

Conflicts:

	solr/CHANGES.txt
SOLR-3861: Refactor SolrCoreState so that it's managed by SolrCore.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1392398 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit d2f7c1769641b4f0c7d4e87f9e03bd8c4c5b516b)

Conflicts:

	solr/CHANGES.txt
SOLR-3961: Fixed error using LimitTokenCountFilterFactory (merge r1399474)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1399482 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0a6127e374730b4ab554b43fdadd7f46630cc8a8)

Conflicts:

	solr/CHANGES.txt
SOLR-3988: Fixed SolrTestCaseJ4.adoc(SolrInputDocument) to respect field and document boosts

SOLR-3981: Fixed bug that resulted in document boosts being compounded in <copyField/> destination fields

(merge r41401916)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1401920 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit f559f84ca0fa1dc185d4196f70c5c22baa228c35)

Conflicts:

	solr/CHANGES.txt
SOLR-3938: prepareCommit command omits commitData

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1402374 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 6ff52997fe4430255ff6a16615e520bf5ad981f8)

Conflicts:

	solr/CHANGES.txt
SOLR-3992: QuerySenderListener doesn't populate document cache

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1402390 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 2418821fe7698cab6f9e8672a2e6b0d5eedff598)

Conflicts:

	solr/CHANGES.txt
SOLR-3998: Atomic update on uniqueKey field itself causes duplicate document

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1402743 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 49f38e77871453c1ff08d601592a836ec71e2ba6)

Conflicts:

	solr/CHANGES.txt
SOLR-4005: If CoreContainer fails to register a created core, it should close it.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1403397 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 3e8b2e4000c93208e1acb4770859c473843b4ac4)

Conflicts:

	solr/CHANGES.txt