Merged revision(s) 1583302 from lucene/dev/trunk:
LUCENE-5560: Cleanup charset handling for Java 7

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