Merged revision(s) 1696072 from lucene/dev/trunk: LUCENE-6740: Reduce warnings emitted by javac #4 (tools)