Update CHANGELOG for 0.21.1-rc2