MT#5565 Add fixes from upstream. Fix usrloc db sync.
Bump version 3.3.6-2