categories getting locked fix (save with race condition on custom_data)
Merge branch 'master' of https://github.com/kaltura/server