MT#5565 add upstream fix for usrloc db sync