fixes from code review PLAT-3485
fixes from code review
PLAT-3485

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