Replacing hackish with stylish...

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354363 13f79535-47bb-0310-9956-ffa450edef68
SOLR-1856: In Solr Cell, literals should override Tika-parsed values (backport)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354460 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4168: Allow storing test execution statistics in an external file.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354474 13f79535-47bb-0310-9956-ffa450edef68
SOLR-1770: Move the default core instance directory into a collection1 folder

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354482 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4166: Fixed bad type checking of Circle shapes in TwoDoublesStrategy

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354804 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4157 Improve TermQueryPrefixTreeStrategy and move makeQuery impl to SpatialStrategy

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

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354829 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4138: Update morfologik (polish stemming) to release 1.5.3. Changed the way morphosyntactic tags are exposed (a list of tags for a single lemma instead of a compound tag).

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354843 13f79535-47bb-0310-9956-ffa450edef68
merge javadoc fix from trunk

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354851 13f79535-47bb-0310-9956-ffa450edef68
SOLR-3467: ExtendedDismax escaping is missing several reserved characters (merge from trunk)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1354872 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4176: fix AnalyzingQueryParser to analyze range endpoints as bytes

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1355008 13f79535-47bb-0310-9956-ffa450edef68
SOLR-3582: Our ZooKeeper watchers respond to session events as if they are change events, creating undesirable side effects.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1355010 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4172: clean up redundant throws clauses (merge from trunk)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1355088 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-4169 mark Lucene spatial classes as @lucene.experimental or @lucene.internal

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1355127 13f79535-47bb-0310-9956-ffa450edef68
fixup changes entries that didnt make the alpha

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

Conflicts:
	solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
	solr/core/src/java/org/apache/solr/core/CoreContainer.java
	solr/core/src/java/org/apache/solr/schema/IndexSchema.java
	solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java