LUCENE-4914: SpatialPrefixTree Cell.reset() forgot the 'leaf' flag.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465330 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4913: ordinal was 0 when all children are returned

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465372 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4667: Our logging configuration files should set ZooKeeper logging to WARN

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1465531 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4917 - allowing ClassifierTestBase to be used not only for BytesRef classifiers

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