Bring changes in line for release of 2.9.2 and 3.0.1
Bring changes in line for release of 2.9.2 and 3.0.1

git-svn-id: 4c5078813df38efa56971a28e09a55254294f104@909796 13f79535-47bb-0310-9956-ffa450edef68

apache/solr,apache/solr,apache/solr,apache/solr,apache/solr