Imported Upstream version 4.0.4
Imported Upstream version 4.1.0
Imported Upstream version 3.3.6
MT#5525 remove upstream applied patches
MT#5565 Add fixes from upstream. Fix usrloc db sync.
Bump version 3.3.6-1