Avoid race condition on entry custom data
PLAT-820 #time 2h
Merge branch 'IX-9.9.0' into IX-9.9.0-PLAT-820

Conflicts:
	alpha/apps/kaltura/lib/propel/php5/KalturaObjectBuilder.php
	alpha/lib/model/om/Baseentry.php
Merge pull request #713 from kaltura/IX-9.9.0-PLAT-820

Avoid race condition on entry custom data