Update NEWS and ChangeLog for upcoming r22