V2.1-stable: prepare for merging changes for a V2.1.1 release

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Acked-by: Niels de Vos <ndevos@redhat.com>