Merge change entry from 4.x (no other files are changed since this only impacted the Lucene 3.x codec).