fix CR comments
fix CR comments

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