Imported Upstream version 4.1.0
Imported Upstream version 3.3.6
Imported Upstream version 4.1.1
Imported Upstream version 3.3.7
Imported Upstream version 4.0.6
Merge tag 'upstream/4.0.6' into ngcp3.1

Upstream version 4.0.6
MT#6217 remove upstream applied patches. Refresh patches.
Bump version 4.0.6-1