Revert "Merge branch 'master' of https://github.com/kaltura/server"

This reverts commit d307679df0d77c5f64e9c6bf8a4ee5ce7cf4b585, reversing
changes made to 3eb8161cb5c20930679376f01012617aeeb7fbc5.
Merge branch 'master' of https://github.com/kaltura/server