changes after code review
changes after code review

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