Merged revision(s) 1718479 from lucene/dev/trunk: LUCENE-6732: Improve logging, add verbose logging of filenames