SOLR-2629: merges CHANGES.txt from 3x r1151947
SOLR-2629: merges CHANGES.txt from 3x r1151947

git-svn-id: 308d55f399f3bd9aa0560a10e81a003040006c48@1151952 13f79535-47bb-0310-9956-ffa450edef68

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