fwr: merge code from trunk

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/trunk/core@92692 6b8eccd3-e8c5-4e7d-8186-e12b5326b719