Code changes to compile with lucene 4.6