-committing patch from LUCENE-3343 and LUCENE-3338 to trunk -fixed javadoc reference to QueryNode in StandardSyntaxParser.jj