Imported Upstream version 4.1.6
Merge tag 'upstream/4.1.6'

Upstream version 4.1.6
MT#9189 remove already applied upstream fixes
MT#9189 update debian changelog