Fix issues after merge

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/document/TroffAnalyzer.java

@@ -35,7 +35,7 @@
 import org.opengrok.indexer.analysis.OGKTextField;
 import org.opengrok.indexer.analysis.WriteXrefArgs;
 import org.opengrok.indexer.analysis.Xrefer;
-import org.opengrok.search.QueryBuilder;
+import org.opengrok.indexer.search.QueryBuilder;
 
 /**
  * Analyzes [tn]roff files Created on September 30, 2005