Merge pull request #974 from kaltura/IX-9.13.0-media-server-client-fixes

Fixes for the media server client
Merge branch 'IX-9.13.0' of https://github.com/kaltura/server into IX-9.13.0-media-server-client-fixes