LUCENE-5907: backport to 4.9.x

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