PLAT-8633: fixes from code review
PLAT-8633: fixes from code review

kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server,kaltura/server,DBezemer/server,kaltura/server,kaltura/server,DBezemer/server,DBezemer/server,DBezemer/server,kaltura/server