redo https://github.com/kaltura/server/pull/3057 which was overridden by https://github.com/kaltura/server/pull/3062.
redo https://github.com/kaltura/server/pull/3057 which was overridden by
https://github.com/kaltura/server/pull/3062.

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