Merged revision(s) 1681998 from lucene/dev/trunk: LUCENE-6501: Flatten subreader structure in ParallelCompositeReader (fixes close listener bug LUCENE-6500)