SOLR-3619: backport to 5x

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