Merged with trunk up to r1144715

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