LUCENE-5223: backport to 4.5


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