Merged revision(s) 1577062 from lucene/dev/trunk:
LUCENE-5519: Fix generics

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