Merged from trunk
SOLR-6118: CHANGES.txt [from revision 1598193]

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