Corrected changelog for 2.2
Merge branch '2.x-maintenance'