On-prem fixes
Merge pull request #1568 from kaltura/IX-9.18.0-onPremDrop2

On-prem fixes