Changes for 5.21.1 -> 5.21.2.

Not included the parts that are automated (module changes and acknowledgements).