Fix for PLAT-239- update userId on entry in case drop folder has match p...

...olicy replace_or_add_as_new