Update CHANGES file

Add CHANGES part from 2.1.1 release
Update CHANGES for the upcoming 2.2.0 release