SOLR-3060: SurroundQParserPlugin highlighting tests (merge r1448863)

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