Fixes required for multicast
Merge pull request #1056 from kaltura/IX-9.14.0-multicast_fixes

Fixes required for multicast