merged change for ABC watermark hash broken by kSecureEntryHelper changes
Merge branch 'IX-9.3.1' of https://github.com/kaltura/server into IX-9.3.1