Changes from code review
Changes from code review

doubleshot/server,kaltura/server,DBezemer/server,DBezemer/server,gale320/server,DBezemer/server,DBezemer/server,kaltura/server,gale320/server,doubleshot/server,doubleshot/server,ivesbai/server,ivesbai/server,ivesbai/server,DBezemer/server,gale320/server,kaltura/server,ivesbai/server,doubleshot/server,doubleshot/server,DBezemer/server,ivesbai/server,gale320/server,ivesbai/server,kaltura/server,DBezemer/server,doubleshot/server,gale320/server,doubleshot/server,gale320/server,gale320/server,DBezemer/server,kaltura/server,ivesbai/server,doubleshot/server,ivesbai/server,kaltura/server,gale320/server