fix errors after testing
Merge branch 'IX-9.0.0' of https://github.com/kaltura/server into IX-9.0.0