Add the missing 2.1.1 and 3.1.0 changelog entries

[ci skip]