Merged revision(s) 1696065 from lucene/dev/branches/branch_5x: Merged revision(s) 1696064 from lucene/dev/trunk: LUCENE-6741: This was already fixed by LUCENE-6740, just add this issue to track changes.