Fixes after merging with Bloomberg lucene 4.6 branch