Apply post-1.21.0 patches, bump version to 1.21.1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

update config for 1.21.1
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: Ibfd9124cbc9be744709dfe07a1a5b30df545e806