JCR-1759: Port to Lucene 3.6.2 (part 2)