SOLR-4842: merge from branch_4x

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