DATASOLR-157 - Forward port changelog entries from bugfix branch.