fwr: revert change- causes errors to be thrown by admin console
Merge branch 'master' of https://github.com/kaltura/server-api