MT#5301 Merge upstream 4.1.1 changes
MT#5301 remove applied upstream patches
Update debian changelog to 4.1.1
MT#5301 add upstream fixes