Merged revision(s) 1457801 from lucene/dev/trunk:
Fix a syntax error in javacc result of surround query parser making new clover fail (and its invalid java code that was created)!

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