Merged revision(s) 1597299 from lucene/dev/trunk:
LUCENE-5704: Fix compilation error with Java 8u20

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1597301 13f79535-47bb-0310-9956-ffa450edef68