Merge with changes in Bloomberg lucene 4.6 branch