Apply post-1.21.0 patches, bump version to 1.21.1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>