merge from trunk

Conflicts:
	lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
	lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
	lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java