LUCENE-5449: backport to 4.x, 1 of 2.


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