SOLR-5615: Deadlock while trying to recover after a ZK session expiration.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1557811 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5615: Add CHANGES entry to 4.6 branch

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1557812 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5615: Fix CHANGES mismerge

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1557814 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5540: HdfsLockFactory should explicitly create the lock parent directory if necessary.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1557848 13f79535-47bb-0310-9956-ffa450edef68
clean up CHANGES

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1557852 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5375: ToChildBlockJoinQuery works harder to detect mis-use, where the parent query incorrectly returns child docs

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558336 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5375: fix javadocs

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558352 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5401: Field.StringTokenStream#end() calls super.end() now.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558877 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4260: ConcurrentUpdateSolrServer#blockUntilFinished can return before all previously added updates have finished. This could cause distributed updates meant for replicas to be lost.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558982 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4260: Add name to CHANGES

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558983 13f79535-47bb-0310-9956-ffa450edef68
remove this folder - should not have been committed

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558984 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4260: Guard against NPE.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558988 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4260: If in blockUntilFinished and there are no Runners running and the queue is not empty, start a new Runner.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1558998 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4260: Bring back import still used on 4.6 branch.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559125 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-Flexible StandardQueryParser behaves differently than ClassicQueryParser (4.6 branch)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559318 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5645: A SolrCore reload via the CoreContainer will try and register in zk again with the new SolrCore.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559581 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5636: SolrRequestParsers does some xpath lookups on every request, which can cause concurrency issues. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559582 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5577: Harden leaking Timer thread.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559589 13f79535-47bb-0310-9956-ffa450edef68
Backport this to 4.6, so we can be sure that next release has correct version and bootclasspath for "nice" javadocs:
Merged revision(s) 1547347 from lucene/dev/branches/branch_4x:
LUCENE-5355: Add support for -Dbootjdk to point to a separate JAVA_HOME that is used to generate javadocs; validate the -Dbootclasspath to point to a valid rt.jar

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_6@1559597 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5608: Harden test.

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