Prevent race conditions on custom-data update
PLAT-739 #time 30m
Merge pull request #679 from kaltura/IX-9.8.0-PLAT-739.2

Prevent race conditions on custom-data update