Merged revision(s) 1696035 from lucene/dev/trunk: LUCENE-6740: Reduce warnings emitted by javac (I also had to fix the old, deprecated jflex grammars, because they got out of sync with java code)